You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ja...@apache.org on 2018/03/07 16:54:40 UTC
[geode] branch develop updated: GEODE-4779: Categorize OQLQuery and
OQLIndex Tests (#1555)
This is an automated email from the ASF dual-hosted git repository.
jasonhuynh pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 336c6e4 GEODE-4779: Categorize OQLQuery and OQLIndex Tests (#1555)
336c6e4 is described below
commit 336c6e44d35642d44a2b8599cfe2d27447bff1f6
Author: Jason Huynh <hu...@gmail.com>
AuthorDate: Wed Mar 7 08:54:36 2018 -0800
GEODE-4779: Categorize OQLQuery and OQLIndex Tests (#1555)
---
.../BaseLineAndCompareQueryPerfJUnitTest.java | 4 ++--
.../query/Bug32947ValueConstraintJUnitTest.java | 3 ++-
.../org/apache/geode/cache/query/BugJUnitTest.java | 3 ++-
.../apache/geode/cache/query/IndexTypeTest.java | 3 ++-
.../cache/query/JoinQueriesIntegrationTest.java | 3 ++-
.../cache/query/LocalQueryServiceJUnitTest.java | 3 ++-
.../geode/cache/query/PdxStringQueryJUnitTest.java | 4 ++--
.../apache/geode/cache/query/QueryJUnitTest.java | 4 ++--
.../geode/cache/query/QueryServiceJUnitTest.java | 3 ++-
.../geode/cache/query/QueryTestUtilsJUnitTest.java | 3 ++-
.../QueryWithBucketParameterIntegrationTest.java | 3 ++-
.../apache/geode/cache/query/RegionJUnitTest.java | 3 ++-
.../geode/cache/query/TypedIteratorJUnitTest.java | 3 ++-
.../cache/query/TypedJsonQueryIntegrationTest.java | 3 ++-
.../query/dunit/CompactRangeIndexDUnitTest.java | 3 ++-
.../cache/query/dunit/CompiledInDUnitTest.java | 6 ++---
.../query/dunit/CorruptedIndexIntegrationTest.java | 6 ++---
.../dunit/GroupByPartitionedQueryDUnitTest.java | 14 ++---------
.../cache/query/dunit/GroupByQueryDUnitTest.java | 5 ++--
.../cache/query/dunit/HashIndexDUnitTest.java | 3 ++-
.../geode/cache/query/dunit/HelperTestCase.java | 3 ++-
.../NonDistinctOrderByPartitionedDUnitTest.java | 9 ++-----
.../query/dunit/OrderByPartitionedDUnitTest.java | 3 ++-
...artitionedRegionCompactRangeIndexDUnitTest.java | 3 ++-
.../dunit/PdxGroupByPartitionedQueryDUnitTest.java | 3 ++-
.../cache/query/dunit/PdxLocalQueryDUnitTest.java | 3 ++-
.../PdxLocalQueryVersionedClassDUnitTest.java | 3 ++-
.../geode/cache/query/dunit/PdxQueryDUnitTest.java | 3 ++-
.../cache/query/dunit/PdxStringQueryDUnitTest.java | 3 ++-
.../dunit/QueryDataInconsistencyDUnitTest.java | 3 ++-
.../cache/query/dunit/QueryIndexDUnitTest.java | 3 ++-
.../query/dunit/QueryIndexUsingXMLDUnitTest.java | 4 ++--
.../dunit/QueryParamsAuthorizationDUnitTest.java | 3 ++-
.../dunit/QueryUsingFunctionContextDUnitTest.java | 6 ++---
.../cache/query/dunit/QueryUsingPoolDUnitTest.java | 3 ++-
.../cache/query/dunit/RemoteQueryDUnitTest.java | 3 ++-
.../ResourceManagerWithQueryMonitorDUnitTest.java | 3 ++-
.../query/dunit/SelectStarQueryDUnitTest.java | 3 ++-
.../functional/ComparisonOperatorsJUnitTest.java | 3 ++-
.../cache/query/functional/ConstantsJUnitTest.java | 3 ++-
.../cache/query/functional/CountStarJUnitTest.java | 3 ++-
.../functional/CustomerOptimizationsJUnitTest.java | 3 ++-
.../DistinctAndNonDistinctQueryJUnitTest.java | 3 ++-
...tinctResultsWithDupValuesInRegionJUnitTest.java | 3 ++-
.../cache/query/functional/FunctionJUnitTest.java | 3 ++-
.../functional/GroupByPartitionedJUnitTest.java | 3 ++-
.../functional/GroupByReplicatedJUnitTest.java | 3 ++-
.../query/functional/INOperatorJUnitTest.java | 4 ++--
.../query/functional/IUM6Bug32345ReJUnitTest.java | 5 ++--
.../geode/cache/query/functional/IUMJUnitTest.java | 4 ++--
.../functional/IUMRCompositeIteratorJUnitTest.java | 4 ++--
.../IUMRMultiIndexesMultiRegionJUnitTest.java | 3 ++-
.../functional/IUMRShuffleIteratorsJUnitTest.java | 3 ++-
.../functional/IUMRSingleRegionJUnitTest.java | 3 ++-
...IndependentOperandsInWhereClause2JUnitTest.java | 4 ++--
.../functional/IndexCreationDeadLockJUnitTest.java | 3 ++-
.../query/functional/IndexCreationJUnitTest.java | 3 ++-
.../IndexMaintenanceAsynchJUnitTest.java | 6 ++---
.../query/functional/IndexOnEntrySetJUnitTest.java | 4 ++--
.../query/functional/IndexOperatorJUnitTest.java | 4 ++--
.../functional/IndexPrimaryKeyUsageJUnitTest.java | 4 ++--
.../IndexUsageInNestedQueryJUnitTest.java | 4 ++--
.../IndexUsageWithAliasAsProjAtrbtJUnitTest.java | 3 ++-
.../IndexUseMultFrmSnglCondJUnitTest.java | 4 ++--
.../IndexWithSngleFrmAndMultCondQryJUnitTest.java | 5 ++--
.../functional/IteratorTypeDefEmpJUnitTest.java | 4 ++--
.../query/functional/IteratorTypeDefJUnitTest.java | 4 ++--
.../IteratorTypeDefaultTypesJUnitTest.java | 4 ++--
.../functional/IumMultConditionJUnitTest.java | 4 ++--
.../query/functional/LikePredicateJUnitTest.java | 3 ++-
.../query/functional/LimitClauseJUnitTest.java | 3 ++-
.../functional/LogicalOperatorsJUnitTest.java | 3 ++-
.../cache/query/functional/MiscJUnitTest.java | 3 ++-
.../functional/MultiIndexCreationJUnitTest.java | 3 ++-
.../functional/MultiRegionIndexUsageJUnitTest.java | 3 ++-
.../query/functional/MultipleRegionsJUnitTest.java | 3 ++-
.../functional/NegativeNumberQueriesJUnitTest.java | 3 ++-
.../query/functional/NestedQueryJUnitTest.java | 4 ++--
.../NonDistinctOrderByPartitionedJUnitTest.java | 3 ++-
.../NonDistinctOrderByReplicatedJUnitTest.java | 3 ++-
.../query/functional/NumericQueryJUnitTest.java | 3 ++-
.../functional/OrderByPartitionedJUnitTest.java | 3 ++-
.../functional/OrderByReplicatedJUnitTest.java | 3 ++-
.../functional/ParameterBindingJUnitTest.java | 3 ++-
.../functional/PdxGroupByPartitionedJUnitTest.java | 3 ++-
.../functional/PdxGroupByReplicatedJUnitTest.java | 3 ++-
.../query/functional/PdxOrderByJUnitTest.java | 3 ++-
.../functional/QRegionInterfaceJUnitTest.java | 3 ++-
.../QueryREUpdateInProgressJUnitTest.java | 7 ++++--
.../query/functional/QueryUndefinedJUnitTest.java | 3 ++-
.../functional/ReservedKeywordsJUnitTest.java | 3 ++-
.../ResultsDataSerializabilityJUnitTest.java | 3 ++-
.../query/functional/SelectToDateJUnitTest.java | 3 ++-
.../functional/StructMemberAccessJUnitTest.java | 4 ++--
.../TestNewFunctionSSorRSIntegrationTest.java | 4 ++--
.../ArithmeticOperationsIntegrationTest.java | 3 ++-
.../internal/CompiledGroupBySelectJUnitTest.java | 3 ++-
.../CompiledJunctionInternalsJUnitTest.java | 3 ++-
.../query/internal/CopyOnReadQueryJUnitTest.java | 3 ++-
.../query/internal/ExecutionContextJUnitTest.java | 3 ++-
.../query/internal/IndexManagerJUnitTest.java | 3 ++-
.../query/internal/OrderByComparatorJUnitTest.java | 3 ++-
.../internal/ProjectionAttributeJUnitTest.java | 3 ++-
.../cache/query/internal/QCompilerJUnitTest.java | 3 ++-
.../QueryFromClauseCanonicalizationJUnitTest.java | 3 ++-
.../internal/QueryObserverCallbackJUnitTest.java | 3 ++-
.../cache/query/internal/QueryTraceJUnitTest.java | 3 ++-
.../cache/query/internal/QueryUtilsJUnitTest.java | 3 ++-
.../AbstractIndexMaintenanceIntegrationTest.java | 3 ++-
.../AsyncIndexUpdaterThreadShutdownJUnitTest.java | 3 ++-
.../index/AsynchIndexMaintenanceJUnitTest.java | 3 ++-
.../index/CompactRangeIndexIndexMapJUnitTest.java | 3 ++-
.../internal/index/CompactRangeIndexJUnitTest.java | 3 ++-
...ompactRangeIndexMaintenanceIntegrationTest.java | 28 ++--------------------
.../CompactRangeIndexQueryIntegrationTest.java | 4 ++--
...ncurrentIndexInitOnOverflowRegionDUnitTest.java | 5 ++--
...ntIndexOperationsOnOverflowRegionDUnitTest.java | 7 ++----
...exUpdateWithInplaceObjectModFalseDUnitTest.java | 3 ++-
.../ConcurrentIndexUpdateWithoutWLDUnitTest.java | 3 ++-
.../internal/index/CopyOnReadIndexDUnitTest.java | 3 ++-
.../internal/index/CopyOnReadIndexJUnitTest.java | 3 ++-
.../index/DeclarativeIndexCreationJUnitTest.java | 3 ++-
.../internal/index/EquiJoinIntegrationTest.java | 3 ++-
.../index/HashIndexMaintenanceIntegrationTest.java | 4 ++--
.../index/HashIndexQueryIntegrationTest.java | 5 ++--
.../index/IndexCreationInternalsJUnitTest.java | 4 ++--
.../query/internal/index/IndexHintJUnitTest.java | 3 ++-
.../cache/query/internal/index/IndexJUnitTest.java | 3 ++-
.../internal/index/IndexMaintainceJUnitTest.java | 5 ++--
.../internal/index/IndexMaintenanceJUnitTest.java | 3 ++-
.../internal/index/IndexStatisticsJUnitTest.java | 3 ++-
.../index/IndexTrackingQueryObserverDUnitTest.java | 5 ++--
.../index/IndexTrackingQueryObserverJUnitTest.java | 3 ++-
.../query/internal/index/IndexUseJUnitTest.java | 3 ++-
.../IndexedMergeEquiJoinScenariosJUnitTest.java | 3 ++-
.../InitializeIndexEntryDestroyQueryDUnitTest.java | 4 ++--
.../internal/index/MapIndexStoreJUnitTest.java | 3 ++-
.../index/MapRangeIndexMaintenanceJUnitTest.java | 3 ++-
.../index/MultiIndexCreationDUnitTest.java | 5 ++--
.../NewDeclarativeIndexCreationJUnitTest.java | 3 ++-
.../internal/index/PartitionedIndexJUnitTest.java | 4 ++--
.../PartitionedRegionEquiJoinIntegrationTest.java | 3 ++-
.../index/PdxCopyOnReadQueryJUnitTest.java | 3 ++-
...ProgRegionCreationIndexUpdateTypeJUnitTest.java | 3 ++-
.../index/PutAllWithIndexPerfDUnitTest.java | 3 ++-
.../internal/index/RangeIndexAPIJUnitTest.java | 3 ++-
.../RangeIndexMaintenanceIntegrationTest.java | 3 ++-
.../partitioned/PRBasicIndexCreationDUnitTest.java | 3 ++-
.../PRBasicMultiIndexCreationDUnitTest.java | 3 ++-
.../query/partitioned/PRBasicQueryDUnitTest.java | 3 ++-
.../partitioned/PRBasicRemoveIndexDUnitTest.java | 3 ++-
.../partitioned/PRColocatedEquiJoinDUnitTest.java | 3 ++-
.../partitioned/PRIndexStatisticsJUnitTest.java | 3 ++-
.../query/partitioned/PRInvalidQueryDUnitTest.java | 3 ++-
.../query/partitioned/PRInvalidQueryJUnitTest.java | 6 ++---
.../partitioned/PRQueryCacheClosedJUnitTest.java | 3 ++-
.../cache/query/partitioned/PRQueryDUnitTest.java | 3 ++-
.../cache/query/partitioned/PRQueryJUnitTest.java | 3 ++-
.../partitioned/PRQueryNumThreadsJUnitTest.java | 3 ++-
.../partitioned/PRQueryPortfolioDUnitTest.java | 3 ++-
.../partitioned/PRQueryRegionCloseDUnitTest.java | 3 ++-
.../partitioned/PRQueryRegionClosedJUnitTest.java | 3 ++-
.../PRQueryRegionDestroyedDUnitTest.java | 3 ++-
.../PRQueryRegionDestroyedJUnitTest.java | 3 ++-
.../PRQueryRemoteNodeExceptionDUnitTest.java | 3 ++-
.../query/transaction/QueryAndJtaJUnitTest.java | 3 ++-
.../query/dunit/QueryIndexUpdateRIDUnitTest.java | 11 ++++-----
.../cache/query/dunit/QueryMonitorDUnitTest.java | 11 ++++-----
.../geode/test/junit/categories/OQLIndexTest.java | 21 +++-------------
.../geode/test/junit/categories/OQLQueryTest.java | 21 +++-------------
gradle/test.gradle | 21 ++++++++++++++++
171 files changed, 371 insertions(+), 318 deletions(-)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java
index 1eecb5b..5426372 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java
@@ -33,13 +33,13 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.*;
import org.apache.geode.cache.query.data.*;
import org.apache.geode.cache.query.internal.*;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
import org.apache.geode.test.junit.categories.PerformanceTest;
/**
* This test is to baseline and compare the performance figures for index usage benchmarks.
*/
-@Category(PerformanceTest.class)
+@Category({PerformanceTest.class, OQLQueryTest.class})
@Ignore("Performance tests should not be run as part of precheckin")
public class BaseLineAndCompareQueryPerfJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/Bug32947ValueConstraintJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/Bug32947ValueConstraintJUnitTest.java
index 40d8ff0..6fe6bcb 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/Bug32947ValueConstraintJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/Bug32947ValueConstraintJUnitTest.java
@@ -30,11 +30,12 @@ import org.apache.geode.cache.*;
import org.apache.geode.cache.query.data.*;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* Junit test for checking the value constraint region attributes.
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class Bug32947ValueConstraintJUnitTest {
DistributedSystem distributedSystem = null;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/BugJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/BugJUnitTest.java
index a8b13dd..151463a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/BugJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/BugJUnitTest.java
@@ -42,11 +42,12 @@ import org.apache.geode.cache.query.internal.QueryUtils;
import org.apache.geode.internal.cache.LocalDataSet;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* Tests reported bugs
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class BugJUnitTest {
Region region;
Region region1;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/IndexTypeTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/IndexTypeTest.java
index d77c460..ab299d7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/IndexTypeTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/IndexTypeTest.java
@@ -20,9 +20,10 @@ import static org.assertj.core.api.Assertions.*;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, OQLIndexTest.class})
public class IndexTypeTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/JoinQueriesIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/JoinQueriesIntegrationTest.java
index f7d703b..ed457429 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/JoinQueriesIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/JoinQueriesIntegrationTest.java
@@ -28,8 +28,9 @@ import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
@RunWith(JUnitParamsRunner.class)
public class JoinQueriesIntegrationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/LocalQueryServiceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/LocalQueryServiceJUnitTest.java
index 492ebb8..62a4cf6 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/LocalQueryServiceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/LocalQueryServiceJUnitTest.java
@@ -32,8 +32,9 @@ import org.apache.geode.cache.client.ClientRegionFactory;
import org.apache.geode.cache.client.ClientRegionShortcut;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class LocalQueryServiceJUnitTest {
private IgnoredException ignoredException;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java
index f27f0e1..b836cc3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java
@@ -24,7 +24,6 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.internal.DefaultQuery;
@@ -43,12 +42,13 @@ import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl;
import org.apache.geode.pdx.internal.PdxInstanceImpl;
import org.apache.geode.pdx.internal.PdxString;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class PdxStringQueryJUnitTest {
private InternalCache c;
private Region r;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/QueryJUnitTest.java
index 0ead2c2..f742ae2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/QueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/QueryJUnitTest.java
@@ -47,17 +47,17 @@ import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.cache.Scope;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.cache.query.internal.index.IndexProtocol;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*/
@FixMethodOrder(NAME_ASCENDING)
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class QueryJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryServiceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/QueryServiceJUnitTest.java
index a420331..c280b1e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/QueryServiceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/QueryServiceJUnitTest.java
@@ -33,11 +33,12 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class QueryServiceJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtilsJUnitTest.java
index 6b8ef78..0bf1d13 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtilsJUnitTest.java
@@ -32,13 +32,14 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.data.Numbers;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* A sample test class using the QueryTestUtils
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class QueryTestUtilsJUnitTest {
private static final long serialVersionUID = 1L;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryWithBucketParameterIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/QueryWithBucketParameterIntegrationTest.java
index e7a0391..ab813fa 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/QueryWithBucketParameterIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/QueryWithBucketParameterIntegrationTest.java
@@ -37,6 +37,7 @@ import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.internal.cache.LocalDataSet;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* @implNote This test class has been designed to test the query execution using the
@@ -44,7 +45,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* used. Different variation of hashset variables are passed to the function to check for
* errors.
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class QueryWithBucketParameterIntegrationTest {
DefaultQuery queryExecutor;
LocalDataSet lds;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/RegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/RegionJUnitTest.java
index c1b317e..c8eb93e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/RegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/RegionJUnitTest.java
@@ -37,6 +37,7 @@ import org.apache.geode.internal.cache.EntrySnapshot;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* RegionJUnitTest.java
@@ -44,7 +45,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* Created on January 31, 2005, 3:54 PM
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class RegionJUnitTest {
static String queries[] = {"status = 'active'", "status <> 'active'", "ID > 2", "ID < 1",
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java
index 1f6a2b7..d9d550f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java
@@ -33,11 +33,12 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class TypedIteratorJUnitTest {
Region region;
QueryService qs;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/TypedJsonQueryIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/TypedJsonQueryIntegrationTest.java
index 5b6e506..fa62a5d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/TypedJsonQueryIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/TypedJsonQueryIntegrationTest.java
@@ -27,6 +27,7 @@ import org.apache.geode.management.internal.cli.json.GfJsonObject;
import org.apache.geode.management.internal.cli.json.TypedJson;
import org.apache.geode.management.internal.cli.json.TypedJsonPdxIntegrationTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* Integration tests for {@link TypedJson} querying {@link Portfolio}.
@@ -37,7 +38,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* TODO: add real assertions
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class TypedJsonQueryIntegrationTest {
private static final String RESULT = "result";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CompactRangeIndexDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CompactRangeIndexDUnitTest.java
index 1db7228..3061ce9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CompactRangeIndexDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CompactRangeIndexDUnitTest.java
@@ -38,8 +38,9 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLIndexTest.class})
public class CompactRangeIndexDUnitTest extends JUnit4DistributedTestCase {
QueryTestUtils utils;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CompiledInDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CompiledInDUnitTest.java
index 6ccb87a..9aaa518 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CompiledInDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CompiledInDUnitTest.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.cache.query.dunit;
-import static org.apache.geode.internal.cache.execute.DistributedRegionFunctionExecutionDUnitTest.region;
-
import java.io.IOException;
import java.io.Serializable;
import java.util.HashMap;
@@ -41,7 +39,6 @@ import org.apache.geode.cache.Scope;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.cache.query.data.PortfolioPdx.Day;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.distributed.ConfigurationProperties;
@@ -52,8 +49,9 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class CompiledInDUnitTest extends JUnit4CacheTestCase {
final String rootRegionName = "root";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CorruptedIndexIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CorruptedIndexIntegrationTest.java
index baa2555..d36912d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CorruptedIndexIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CorruptedIndexIntegrationTest.java
@@ -21,10 +21,8 @@ import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.concurrent.TimeUnit;
import java.util.stream.IntStream;
-import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -38,11 +36,11 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import org.apache.geode.cache.query.internal.index.IndexProtocol;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLIndexTest.class})
public class CorruptedIndexIntegrationTest extends JUnit4CacheTestCase {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
index d73f5ec..659378a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
@@ -14,34 +14,24 @@
*/
package org.apache.geode.cache.query.dunit;
-import static org.junit.Assert.*;
-
-import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.cache.query.Index;
-import org.apache.geode.cache.query.IndexExistsException;
-import org.apache.geode.cache.query.IndexInvalidException;
-import org.apache.geode.cache.query.IndexNameConflictException;
-import org.apache.geode.cache.query.IndexType;
-import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.cache.query.functional.GroupByTestImpl;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class GroupByPartitionedQueryDUnitTest extends GroupByDUnitImpl {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java
index 1518520..2f64ce6 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java
@@ -37,19 +37,18 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class GroupByQueryDUnitTest extends JUnit4CacheTestCase {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/HashIndexDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/HashIndexDUnitTest.java
index 78b092f..93b6731 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/HashIndexDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/HashIndexDUnitTest.java
@@ -31,8 +31,9 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLIndexTest.class})
public class HashIndexDUnitTest extends JUnit4DistributedTestCase {
QueryTestUtils utils;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/HelperTestCase.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/HelperTestCase.java
index c9eaf22..765a7b9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/HelperTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/HelperTestCase.java
@@ -52,8 +52,9 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class HelperTestCase extends JUnit4CacheTestCase {
protected void createPartitionRegion(VM vm, final String regionName,
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
index 906741e..0bd6cbf 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
@@ -14,9 +14,6 @@
*/
package org.apache.geode.cache.query.dunit;
-import static org.junit.Assert.*;
-
-import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
@@ -30,19 +27,17 @@ import org.apache.geode.cache.query.IndexNameConflictException;
import org.apache.geode.cache.query.IndexType;
import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.cache.query.functional.NonDistinctOrderByTestImplementation;
-import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class NonDistinctOrderByPartitionedDUnitTest extends NonDistinctOrderByDUnitImpl {
public NonDistinctOrderByPartitionedDUnitTest() {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/OrderByPartitionedDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/OrderByPartitionedDUnitTest.java
index 323559e..7008143 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/OrderByPartitionedDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/OrderByPartitionedDUnitTest.java
@@ -35,8 +35,9 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class OrderByPartitionedDUnitTest extends JUnit4CacheTestCase {
private OrderByPartitionedJUnitTest createTestInstance() {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
index 038d30d..5946e43 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
@@ -38,9 +38,10 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
import org.apache.geode.util.test.TestUtil;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class PartitionedRegionCompactRangeIndexDUnitTest extends JUnit4DistributedTestCase {
private Properties getSystemProperties(String cacheXML) {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxGroupByPartitionedQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxGroupByPartitionedQueryDUnitTest.java
index 9528693..5766e6e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxGroupByPartitionedQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxGroupByPartitionedQueryDUnitTest.java
@@ -25,8 +25,9 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class PdxGroupByPartitionedQueryDUnitTest extends GroupByDUnitImpl {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryDUnitTest.java
index 64e149e..8512673 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryDUnitTest.java
@@ -48,8 +48,9 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class PdxLocalQueryDUnitTest extends PDXQueryTestBase {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java
index 93faa26..14bf66b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java
@@ -38,8 +38,9 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class PdxLocalQueryVersionedClassDUnitTest extends PDXQueryTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java
index 5e5486c..5018472 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java
@@ -71,8 +71,9 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class PdxQueryDUnitTest extends PDXQueryTestBase {
public static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java
index cc12d93..fd9d7ad 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java
@@ -72,8 +72,9 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class PdxStringQueryDUnitTest extends JUnit4CacheTestCase {
final String rootRegionName = "root";
final String regionName = "PdxTest";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
index 8b9d9e1..5c006b9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
@@ -53,11 +53,12 @@ import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
* This tests the data inconsistency during update on an index and querying the same UNLOCKED index.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLIndexTest.class})
public class QueryDataInconsistencyDUnitTest extends JUnit4CacheTestCase {
private static final int cnt = 0;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java
index 2938800..99781b0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java
@@ -57,9 +57,10 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLIndexTest.class})
public class QueryIndexDUnitTest extends JUnit4CacheTestCase {
public static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
index e08b019..4879973 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
@@ -35,7 +35,6 @@ import org.apache.commons.io.FileUtils;
import org.awaitility.Awaitility;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -61,9 +60,10 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLIndexTest.class})
public class QueryIndexUsingXMLDUnitTest extends JUnit4CacheTestCase {
private static final String NAME = "PartitionedPortfolios";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
index 59ad61a..f593f35 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
@@ -44,13 +44,14 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* Test for accessing query bind parameters from authorization callbacks
*
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class QueryParamsAuthorizationDUnitTest extends JUnit4CacheTestCase {
private final String regName = "exampleRegion";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
index 27089c9..c8e04db 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
@@ -53,9 +53,7 @@ import org.apache.geode.cache.query.functional.StructSetOrResultsSet;
import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.cache.query.internal.IndexTrackingQueryObserver;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import org.apache.geode.cache.query.partitioned.PRQueryDUnitHelper;
import org.apache.geode.cache30.CacheSerializableRunnable;
-import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.cache.LocalDataSet;
import org.apache.geode.internal.cache.PartitionedRegion;
@@ -69,15 +67,15 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* This tests the querying using a RegionFunctionContext which provides a filter (routing keys) to
* run the query on subset of buckets "locally". If query includes buckets
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase {
private static final int cnt = 0;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
index 3bb9695..3d241a3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -65,13 +65,14 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* Tests remote (client/server) query execution.
*
* @since GemFire 5.0.1
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
index 44c683d..93ea42c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
@@ -55,13 +55,14 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* Tests remote (client/server) query execution.
*
* @since GemFire 5.0.1
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class RemoteQueryDUnitTest extends JUnit4CacheTestCase {
/** The port on which the bridge server was started in this VM */
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
index 452338c..8e54faf 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
@@ -82,8 +82,9 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCase {
private static int MAX_TEST_QUERY_TIMEOUT = 4000;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java
index ed15eca..567b91f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java
@@ -49,11 +49,12 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* Test for #44807 to eliminate unnecessary serialization/deserialization in select * queries
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class SelectStarQueryDUnitTest extends JUnit4CacheTestCase {
/** Used for saving & restoring oldObserver without serialization */
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ComparisonOperatorsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/ComparisonOperatorsJUnitTest.java
index 775c0c0..3f85b3c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ComparisonOperatorsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/ComparisonOperatorsJUnitTest.java
@@ -37,11 +37,12 @@ import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class ComparisonOperatorsJUnitTest {
public ComparisonOperatorsJUnitTest() {}
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ConstantsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/ConstantsJUnitTest.java
index 5cada31..59490a4 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ConstantsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/ConstantsJUnitTest.java
@@ -33,8 +33,9 @@ import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class ConstantsJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java
index fef2f80..6216a27 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java
@@ -41,12 +41,13 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* This test runs {Select COUNT(*) from /regionName [where clause]} queries on different types of
* regions with and without multiple indexes.
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class CountStarJUnitTest {
private static String regionName = "test";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/CustomerOptimizationsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/CustomerOptimizationsJUnitTest.java
index d2a5f5a..ed885fb 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/CustomerOptimizationsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/CustomerOptimizationsJUnitTest.java
@@ -42,8 +42,9 @@ import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class CustomerOptimizationsJUnitTest {
public CustomerOptimizationsJUnitTest() {}
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctAndNonDistinctQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctAndNonDistinctQueryJUnitTest.java
index a49189c..ccd6f4d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctAndNonDistinctQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctAndNonDistinctQueryJUnitTest.java
@@ -37,8 +37,9 @@ import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class DistinctAndNonDistinctQueryJUnitTest {
static List data =
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
index 7a4f6e9..5de3f9f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
@@ -34,11 +34,12 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class DistinctResultsWithDupValuesInRegionJUnitTest {
private static String regionName = "test";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/FunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/FunctionJUnitTest.java
index 86f5700..f83d262 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/FunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/FunctionJUnitTest.java
@@ -43,8 +43,9 @@ import org.apache.geode.cache.query.internal.CompiledValue;
import org.apache.geode.cache.query.internal.ExecutionContext;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class FunctionJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByPartitionedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByPartitionedJUnitTest.java
index 9d846c6..a037ed5 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByPartitionedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByPartitionedJUnitTest.java
@@ -21,12 +21,13 @@ import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class GroupByPartitionedJUnitTest extends GroupByTestImpl {
// public static Test suite() {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java
index c38fc12..a21d96e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java
@@ -19,12 +19,13 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class GroupByReplicatedJUnitTest extends GroupByTestImpl {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java
index 56a92de..937ae42 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java
@@ -41,13 +41,13 @@ import org.apache.geode.cache.query.IndexType;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.cache.query.Utils;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class INOperatorJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUM6Bug32345ReJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUM6Bug32345ReJUnitTest.java
index fa30a48..e82ede0 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUM6Bug32345ReJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUM6Bug32345ReJUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import java.util.Objects;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
@@ -36,20 +35,20 @@ import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.Struct;
-import org.apache.geode.cache.query.Utils;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
* IUM6Bug32345ReJUnitTest.java
*
* Created on May 5, 2005, 10:32 AM
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IUM6Bug32345ReJUnitTest {
StructType resType1 = null;
StructType resType2 = null;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java
index cd52bf8..367b94d 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java
@@ -39,15 +39,15 @@ import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.Struct;
-import org.apache.geode.cache.query.Utils;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IUMJUnitTest {
StructType resType1 = null;
StructType resType2 = null;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java
index 7a2f633..f86350a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java
@@ -40,7 +40,6 @@ import org.apache.geode.cache.query.IndexType;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.cache.query.Utils;
import org.apache.geode.cache.query.data.Address;
import org.apache.geode.cache.query.data.Country;
import org.apache.geode.cache.query.data.Employee;
@@ -49,11 +48,12 @@ import org.apache.geode.cache.query.data.Street;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IUMRCompositeIteratorJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java
index 18f726c..7833090 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java
@@ -51,11 +51,12 @@ import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.internal.index.IndexManager;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IUMRMultiIndexesMultiRegionJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRShuffleIteratorsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRShuffleIteratorsJUnitTest.java
index ee66290..1e7d4d7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRShuffleIteratorsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRShuffleIteratorsJUnitTest.java
@@ -46,8 +46,9 @@ import org.apache.geode.cache.query.data.Street;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IUMRShuffleIteratorsJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java
index 1bf0767..6722796 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java
@@ -38,10 +38,11 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IUMRSingleRegionJUnitTest {
private static final String indexName = "queryTest";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java
index 5350078..738d679 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java
@@ -36,16 +36,16 @@ import org.apache.geode.cache.query.IndexType;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.cache.query.Utils;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class IndependentOperandsInWhereClause2JUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationDeadLockJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationDeadLockJUnitTest.java
index e572752..ab79dc6 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationDeadLockJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationDeadLockJUnitTest.java
@@ -42,8 +42,9 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.util.CacheWriterAdapter;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IndexCreationDeadLockJUnitTest {
private static final String indexName = "queryTest";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java
index 6c0f2db..1f465c3 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java
@@ -83,8 +83,9 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IndexCreationJUnitTest {
private ObjectType resType1 = null;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
index 7ed328f..de06082 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
@@ -38,21 +38,19 @@ import org.apache.geode.cache.query.IndexStatistics;
import org.apache.geode.cache.query.IndexType;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
-import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.cache.query.Utils;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import org.apache.geode.cache.query.internal.ResultsSet;
import org.apache.geode.cache.query.internal.index.IndexProtocol;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IndexMaintenanceAsynchJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOnEntrySetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOnEntrySetJUnitTest.java
index 4963c42..e76aed0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOnEntrySetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOnEntrySetJUnitTest.java
@@ -23,7 +23,6 @@ import java.util.Collection;
import java.util.Iterator;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -35,8 +34,9 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.internal.index.IndexManager;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IndexOnEntrySetJUnitTest {
private static String testRegionName = "regionName";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java
index 68d3af0..dbf780c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java
@@ -34,14 +34,14 @@ import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.TypeMismatchException;
-import org.apache.geode.cache.query.Utils;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IndexOperatorJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java
index f7bfee6..5e296dd 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java
@@ -38,18 +38,18 @@ import org.apache.geode.cache.query.IndexType;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.cache.query.Utils;
import org.apache.geode.cache.query.data.Address;
import org.apache.geode.cache.query.data.Employee;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IndexPrimaryKeyUsageJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java
index d2fc9e3..9d0ffa7 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java
@@ -36,16 +36,16 @@ import org.apache.geode.cache.query.IndexType;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.cache.query.Utils;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IndexUsageInNestedQueryJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageWithAliasAsProjAtrbtJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageWithAliasAsProjAtrbtJUnitTest.java
index 63adcef..ba20848 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageWithAliasAsProjAtrbtJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageWithAliasAsProjAtrbtJUnitTest.java
@@ -40,8 +40,9 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IndexUsageWithAliasAsProjAtrbtJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUseMultFrmSnglCondJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUseMultFrmSnglCondJUnitTest.java
index a03eb23..a776da2 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUseMultFrmSnglCondJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUseMultFrmSnglCondJUnitTest.java
@@ -40,15 +40,15 @@ import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.Struct;
-import org.apache.geode.cache.query.Utils;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IndexUseMultFrmSnglCondJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java
index c359a4c..4d31cf3 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java
@@ -31,7 +31,6 @@ import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import java.util.Objects;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
@@ -51,7 +50,6 @@ import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.Struct;
-import org.apache.geode.cache.query.Utils;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
@@ -59,8 +57,9 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IndexWithSngleFrmAndMultCondQryJUnitTest {
StructType resType1 = null;
StructType resType2 = null;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java
index f4142ea..3565cf3 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java
@@ -35,13 +35,13 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.Query;
-import org.apache.geode.cache.query.Utils;
import org.apache.geode.cache.query.data.Address;
import org.apache.geode.cache.query.data.Employee;
import org.apache.geode.cache.query.data.Manager;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class IteratorTypeDefEmpJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java
index a2cd777..dcdbec1 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java
@@ -33,11 +33,11 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.cache.query.Utils;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class IteratorTypeDefJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java
index 0a6d59e..962df01 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java
@@ -36,11 +36,11 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.cache.query.Utils;
import org.apache.geode.cache.query.data.Student;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class IteratorTypeDefaultTypesJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IumMultConditionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IumMultConditionJUnitTest.java
index 13fbdcc..ff5d271 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IumMultConditionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IumMultConditionJUnitTest.java
@@ -26,7 +26,6 @@ import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import java.util.Objects;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
@@ -49,8 +48,9 @@ import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IumMultConditionJUnitTest {
StructType resType1 = null;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/LikePredicateJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/LikePredicateJUnitTest.java
index cdde9e6..ce7e0a6 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/LikePredicateJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/LikePredicateJUnitTest.java
@@ -52,8 +52,9 @@ import org.apache.geode.cache.query.internal.index.IndexManager.TestHook;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class LikePredicateJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
index d5a2e8c..4cde2ad 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
@@ -51,11 +51,12 @@ import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class LimitClauseJUnitTest {
Region region;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/LogicalOperatorsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/LogicalOperatorsJUnitTest.java
index 77c74ec..88be289 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/LogicalOperatorsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/LogicalOperatorsJUnitTest.java
@@ -33,11 +33,12 @@ import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class LogicalOperatorsJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MiscJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/MiscJUnitTest.java
index a58ce19..29cabef 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MiscJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/MiscJUnitTest.java
@@ -49,8 +49,9 @@ import org.apache.geode.cache.query.data.Data;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class MiscJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiIndexCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiIndexCreationJUnitTest.java
index 158dca2..b7004da 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiIndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiIndexCreationJUnitTest.java
@@ -45,8 +45,9 @@ import org.apache.geode.cache.query.internal.index.CompactRangeIndex;
import org.apache.geode.cache.query.internal.index.HashIndex;
import org.apache.geode.cache.query.internal.index.PrimaryKeyIndex;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class MultiIndexCreationJUnitTest {
private static String regionName = "portfolios";
private String prRegionName = "prPortfolios";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
index 82ebd89..ec3c563 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
@@ -39,11 +39,12 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
// TODO:TEST clean this up and add assertions
/**
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class MultiRegionIndexUsageJUnitTest {
private static final String indexName = "queryTest";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultipleRegionsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultipleRegionsJUnitTest.java
index 2161ce0..8ed1cfd 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultipleRegionsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultipleRegionsJUnitTest.java
@@ -36,11 +36,12 @@ import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.data.Data;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class MultipleRegionsJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java
index 3099a66..db45933 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java
@@ -34,11 +34,12 @@ import org.apache.geode.cache.query.*;
import org.apache.geode.cache.query.data.Numbers;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
// TODO:TEST clean this up and add assertions
/**
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class NegativeNumberQueriesJUnitTest {
private Cache cache;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java
index f48f581..48cb5c1 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java
@@ -41,15 +41,15 @@ import org.apache.geode.cache.query.IndexType;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.cache.query.Utils;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.internal.StructImpl;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class NestedQueryJUnitTest {
private ObjectType resType1 = null;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByPartitionedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByPartitionedJUnitTest.java
index a414585..3846e2f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByPartitionedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByPartitionedJUnitTest.java
@@ -35,12 +35,13 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class NonDistinctOrderByPartitionedJUnitTest extends NonDistinctOrderByTestImplementation {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java
index f7f3bc6..0116572 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java
@@ -44,12 +44,13 @@ import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class NonDistinctOrderByReplicatedJUnitTest extends NonDistinctOrderByTestImplementation {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java
index 8f095fe..e1746d2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java
@@ -44,8 +44,9 @@ import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class NumericQueryJUnitTest {
private static String testRegionName = "testRegion";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
index cb7cdb5..e5f3f9e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
@@ -43,12 +43,13 @@ import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.query.dunit.QueryUsingPoolDUnitTest.TestObject;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class OrderByPartitionedJUnitTest extends OrderByTestImplementation {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByReplicatedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByReplicatedJUnitTest.java
index 73446b0..b965f9d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByReplicatedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByReplicatedJUnitTest.java
@@ -45,8 +45,9 @@ import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class OrderByReplicatedJUnitTest extends OrderByTestImplementation {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ParameterBindingJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/ParameterBindingJUnitTest.java
index 3647bcd..446d9ad 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ParameterBindingJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/ParameterBindingJUnitTest.java
@@ -43,11 +43,12 @@ import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class ParameterBindingJUnitTest {
String regionName = "Portfolios";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxGroupByPartitionedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxGroupByPartitionedJUnitTest.java
index 099a6ec..60c1432 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxGroupByPartitionedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxGroupByPartitionedJUnitTest.java
@@ -21,8 +21,9 @@ import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class PdxGroupByPartitionedJUnitTest extends PdxGroupByTestImpl {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxGroupByReplicatedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxGroupByReplicatedJUnitTest.java
index 73ffc81..b8733a2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxGroupByReplicatedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxGroupByReplicatedJUnitTest.java
@@ -19,9 +19,10 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class PdxGroupByReplicatedJUnitTest extends PdxGroupByTestImpl {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxOrderByJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxOrderByJUnitTest.java
index 7a106b5..394fbf9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxOrderByJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxOrderByJUnitTest.java
@@ -47,8 +47,9 @@ import org.apache.geode.cache.query.types.CollectionType;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class PdxOrderByJUnitTest {
private final String rootRegionName = "root";
private final String regionName = "PdxTest";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QRegionInterfaceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/QRegionInterfaceJUnitTest.java
index b723533..0fea8d0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QRegionInterfaceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/QRegionInterfaceJUnitTest.java
@@ -36,11 +36,12 @@ import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class QRegionInterfaceJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java
index d03cf43..538d1d3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java
@@ -44,6 +44,7 @@ import org.apache.geode.internal.cache.LocalRegion.NonTXEntry;
import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
* This tests puts some values in a Local Region and sets all region entries being updated as true
@@ -52,8 +53,10 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
*
*/
-@Category({IntegrationTest.class, FlakyTest.class}) // GEODE-1059: uses PRQueryHelper which launches
- // dunit vms in IntegrationTest
+@Category({IntegrationTest.class, FlakyTest.class, OQLIndexTest.class}) // GEODE-1059: uses
+ // PRQueryHelper which
+ // launches
+// dunit vms in IntegrationTest
public class QueryREUpdateInProgressJUnitTest {
private static final String exampleRegionName = "exampleRegion2";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryUndefinedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryUndefinedJUnitTest.java
index 55ed158..7181a96 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryUndefinedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryUndefinedJUnitTest.java
@@ -38,8 +38,9 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.pdx.JSONFormatter;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class QueryUndefinedJUnitTest implements Serializable {
private static String regionName = "test";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ReservedKeywordsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/ReservedKeywordsJUnitTest.java
index d8826ff..0d167a5 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ReservedKeywordsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/ReservedKeywordsJUnitTest.java
@@ -33,10 +33,11 @@ import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.data.Keywords;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class ReservedKeywordsJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ResultsDataSerializabilityJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/ResultsDataSerializabilityJUnitTest.java
index 31252f1..9da7ef9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ResultsDataSerializabilityJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/ResultsDataSerializabilityJUnitTest.java
@@ -56,12 +56,13 @@ import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* Test whether query results are DataSerializable
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class ResultsDataSerializabilityJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java
index 173befb..bf17c04 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java
@@ -37,8 +37,9 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class SelectToDateJUnitTest {
private static String regionName = "test";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java
index 4da1e52..acea532 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.cache.query.Utils;
import org.apache.geode.cache.query.data.Address;
import org.apache.geode.cache.query.data.Employee;
import org.apache.geode.cache.query.data.Manager;
@@ -46,10 +45,11 @@ import org.apache.geode.cache.query.internal.StructSet;
import org.apache.geode.cache.query.types.CollectionType;
import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class StructMemberAccessJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java
index 957ec29..28dc1bf 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java
@@ -35,16 +35,16 @@ import org.apache.geode.cache.query.Index;
import org.apache.geode.cache.query.IndexType;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
-import org.apache.geode.cache.query.Utils;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* TODO: does this test provide any valuable coverage?
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class TestNewFunctionSSorRSIntegrationTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ArithmeticOperationsIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ArithmeticOperationsIntegrationTest.java
index 99f01bb..442146d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ArithmeticOperationsIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ArithmeticOperationsIntegrationTest.java
@@ -33,9 +33,10 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class ArithmeticOperationsIntegrationTest {
@Rule
public ServerStarterRule serverStarterRule = new ServerStarterRule().withAutoStart();
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java
index f9b528c..1337893 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java
@@ -31,12 +31,13 @@ import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class CompiledGroupBySelectJUnitTest {
private Region rgn;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledJunctionInternalsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledJunctionInternalsJUnitTest.java
index f05c6b2..6a29703 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledJunctionInternalsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledJunctionInternalsJUnitTest.java
@@ -50,12 +50,13 @@ import org.apache.geode.cache.query.internal.index.IndexManager;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class CompiledJunctionInternalsJUnitTest {
Region region;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CopyOnReadQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CopyOnReadQueryJUnitTest.java
index 778ab78..4b357e8 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CopyOnReadQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CopyOnReadQueryJUnitTest.java
@@ -32,12 +32,13 @@ import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class CopyOnReadQueryJUnitTest {
static int numObjects = 10;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java
index 5d2fce4..7155982 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java
@@ -44,12 +44,13 @@ import org.apache.geode.cache.query.data.Position;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class ExecutionContextJUnitTest {
boolean failure = false;
String exceptionStr = "";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/IndexManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/IndexManagerJUnitTest.java
index d5b825a..c7f2498 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/IndexManagerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/IndexManagerJUnitTest.java
@@ -35,8 +35,9 @@ import org.apache.geode.cache.query.internal.index.IndexData;
import org.apache.geode.cache.query.internal.index.IndexManager;
import org.apache.geode.cache.query.internal.index.IndexUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IndexManagerJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/OrderByComparatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/OrderByComparatorJUnitTest.java
index 8481e17..d03a943 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/OrderByComparatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/OrderByComparatorJUnitTest.java
@@ -38,8 +38,9 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class OrderByComparatorJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ProjectionAttributeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ProjectionAttributeJUnitTest.java
index 240dcd0..0cc4cce 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ProjectionAttributeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ProjectionAttributeJUnitTest.java
@@ -46,12 +46,13 @@ import org.apache.geode.cache.query.data.Quote;
import org.apache.geode.cache.query.data.Restricted;
import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class ProjectionAttributeJUnitTest {
String queries[] = {"select distinct p from /pos p where p.ID > 0 ", // ResultSet
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QCompilerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QCompilerJUnitTest.java
index 4498971..9560bb8 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QCompilerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QCompilerJUnitTest.java
@@ -36,12 +36,13 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class QCompilerJUnitTest {
QueryExecutionContext context = new QueryExecutionContext(null, null);
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryFromClauseCanonicalizationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryFromClauseCanonicalizationJUnitTest.java
index a121a1c..274a80d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryFromClauseCanonicalizationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryFromClauseCanonicalizationJUnitTest.java
@@ -38,11 +38,12 @@ import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class QueryFromClauseCanonicalizationJUnitTest {
Region region = null;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObserverCallbackJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObserverCallbackJUnitTest.java
index 16b0c27..f2916fc 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObserverCallbackJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObserverCallbackJUnitTest.java
@@ -45,12 +45,13 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.index.IndexManager;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class QueryObserverCallbackJUnitTest {
Region region;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryTraceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryTraceJUnitTest.java
index 805491c..682d284 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryTraceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryTraceJUnitTest.java
@@ -45,11 +45,12 @@ import org.apache.geode.cache.query.internal.index.CompactRangeIndex;
import org.apache.geode.cache.query.internal.index.IndexProtocol;
import org.apache.geode.cache.query.internal.index.PartitionedIndex;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class QueryTraceJUnitTest {
static QueryService qs;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java
index 37fe400..d9e1f31 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java
@@ -43,12 +43,13 @@ import org.apache.geode.cache.query.data.Employee;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class QueryUtilsJUnitTest {
Region region;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AbstractIndexMaintenanceIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AbstractIndexMaintenanceIntegrationTest.java
index f3b6377..6a5f797 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AbstractIndexMaintenanceIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AbstractIndexMaintenanceIntegrationTest.java
@@ -33,8 +33,9 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.pdx.internal.PdxString;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public abstract class AbstractIndexMaintenanceIntegrationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
index a10d71b..b47dcf0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
@@ -29,6 +29,7 @@ import org.apache.geode.cache.query.internal.index.IndexManager.IndexUpdaterThre
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.logging.LoggingThreadGroup;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
* Test create a region (Replicated OR Partitioned) and sets index maintenance Asynchronous so that
@@ -38,7 +39,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class AsyncIndexUpdaterThreadShutdownJUnitTest {
String name = "PR_with_Async_Index";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
index a7b6b63..b94d8d6 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
@@ -40,8 +40,9 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class AsynchIndexMaintenanceJUnitTest {
private QueryService qs;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java
index c3ed673..42e6356 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java
@@ -31,8 +31,9 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class CompactRangeIndexIndexMapJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexJUnitTest.java
index 327bf8b..afd4a7e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexJUnitTest.java
@@ -41,8 +41,9 @@ import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.cache.query.internal.DefaultQuery.TestHook;
import org.apache.geode.internal.cache.persistence.query.CloseableIterator;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class CompactRangeIndexJUnitTest {
private QueryTestUtils utils;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexMaintenanceIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexMaintenanceIntegrationTest.java
index 4b29f0e..d2d49dd 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexMaintenanceIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexMaintenanceIntegrationTest.java
@@ -14,40 +14,16 @@
*/
package org.apache.geode.cache.query.internal.index;
-import static java.rmi.activation.ActivationGroup.getSystem;
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.After;
-import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.IndexExistsException;
import org.apache.geode.cache.query.IndexNameConflictException;
-import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.RegionNotFoundException;
-import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.cache.query.data.PortfolioPdx;
-import org.apache.geode.cache.query.internal.index.CompactRangeIndex;
-import org.apache.geode.cache.query.internal.index.IndexProtocol;
-import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.Invoke;
-import org.apache.geode.test.dunit.SerializableRunnable;
-import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class CompactRangeIndexMaintenanceIntegrationTest
extends AbstractIndexMaintenanceIntegrationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexQueryIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexQueryIntegrationTest.java
index 885edd7..ff256d4 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexQueryIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexQueryIntegrationTest.java
@@ -31,15 +31,15 @@ import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.query.Query;
-import org.apache.geode.cache.query.QueryInvocationTargetException;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.PortfolioPdx;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class CompactRangeIndexQueryIntegrationTest {
@Rule
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
index 14797d0..b33b73b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
@@ -45,7 +45,6 @@ import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.cache.query.internal.index.IndexManager.TestHook;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.cache30.CacheSerializableRunnable;
-import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.cache.EvictionAttributesImpl;
import org.apache.geode.test.dunit.AsyncInvocation;
@@ -57,13 +56,13 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLIndexTest.class})
public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends JUnit4CacheTestCase {
String name;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
index 8fe005e..51bc00c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
@@ -19,9 +19,7 @@ package org.apache.geode.cache.query.internal.index;
import static org.junit.Assert.*;
-import java.util.Collection;
import java.util.Properties;
-import java.util.Set;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -41,7 +39,6 @@ import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.cache30.CacheSerializableRunnable;
-import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.cache.EvictionAttributesImpl;
import org.apache.geode.test.dunit.AsyncInvocation;
@@ -51,9 +48,9 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
* Test creates a persistent-overflow region and performs updates in region which has compact
@@ -65,7 +62,7 @@ import org.apache.geode.test.junit.categories.FlakyTest;
*
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLIndexTest.class})
public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends JUnit4CacheTestCase {
String name;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
index 1eb4ef8..2f27e16 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
@@ -58,6 +58,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
* This test is similar to {@link ConcurrentIndexUpdateWithoutWLDUnitTest} except that it sets
@@ -67,7 +68,7 @@ import org.apache.geode.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.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLIndexTest.class})
public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest
extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
index c19b566..8671653 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
@@ -58,12 +58,13 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
* During validation all region operations are paused for a while. Validation happens multiple time
* during one test run on a fixed time interval.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLIndexTest.class})
public class ConcurrentIndexUpdateWithoutWLDUnitTest extends JUnit4DistributedTestCase {
PRQueryDUnitHelper helper = new PRQueryDUnitHelper();
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
index 2b3baf9..729f493 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
@@ -56,8 +56,9 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLIndexTest.class})
public class CopyOnReadIndexDUnitTest extends JUnit4CacheTestCase {
VM vm0;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
index e5a9d6a..e15e258 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
@@ -29,12 +29,13 @@ import org.apache.geode.cache.query.*;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class CopyOnReadIndexJUnitTest {
static int numObjects = 10;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
index 3dd048e..a8e7351 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
@@ -37,9 +37,10 @@ import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
import org.apache.geode.util.test.TestUtil;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class DeclarativeIndexCreationJUnitTest {
private DistributedSystem ds;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/EquiJoinIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/EquiJoinIntegrationTest.java
index 644f801..c12ab5e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/EquiJoinIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/EquiJoinIntegrationTest.java
@@ -44,8 +44,9 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.functional.StructSetOrResultsSet;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class EquiJoinIntegrationTest {
QueryService qs;
Region region1, region2, region3, region4;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexMaintenanceIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexMaintenanceIntegrationTest.java
index afcc067..9247bcb 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexMaintenanceIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexMaintenanceIntegrationTest.java
@@ -31,10 +31,10 @@ import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class HashIndexMaintenanceIntegrationTest extends AbstractIndexMaintenanceIntegrationTest {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexQueryIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexQueryIntegrationTest.java
index 3daaa19..77c3452 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexQueryIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexQueryIntegrationTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertTrue;
import java.io.Serializable;
import java.text.ParseException;
import java.util.Collection;
-import java.util.Iterator;
import org.junit.After;
import org.junit.Before;
@@ -36,7 +35,6 @@ import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
-import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.Index;
import org.apache.geode.cache.query.IndexInvalidException;
@@ -48,8 +46,9 @@ import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class HashIndexQueryIntegrationTest {
private QueryService qs;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexCreationInternalsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexCreationInternalsJUnitTest.java
index d6766fe..671c37b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexCreationInternalsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexCreationInternalsJUnitTest.java
@@ -41,15 +41,15 @@ import org.apache.geode.cache.query.internal.CompiledPath;
import org.apache.geode.cache.query.internal.CompiledRegion;
import org.apache.geode.cache.query.internal.QCompiler;
import org.apache.geode.cache.query.internal.types.TypeUtils;
-import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IndexCreationInternalsJUnitTest {
protected String childThreadName1 = "";
protected String childThreadName2 = "";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexHintJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexHintJUnitTest.java
index 1337271..4c5c1fa 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexHintJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexHintJUnitTest.java
@@ -38,8 +38,9 @@ import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IndexHintJUnitTest {
private Region region;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexJUnitTest.java
index 683c99d..be40e95 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexJUnitTest.java
@@ -34,10 +34,11 @@ import org.apache.geode.cache.query.IndexType;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IndexJUnitTest {
private static final String indexName = "testIndex";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java
index 8c3ba0d..2271eb4 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java
@@ -28,7 +28,6 @@ import java.util.Collection;
import org.junit.After;
import org.junit.Before;
import org.junit.FixMethodOrder;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runners.MethodSorters;
@@ -45,19 +44,19 @@ import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.cache.query.Utils;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.functional.StructSetOrResultsSet;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IndexMaintainceJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java
index a7c1353..44ed9ce 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java
@@ -62,11 +62,12 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.internal.cache.persistence.query.CloseableIterator;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IndexMaintenanceJUnitTest {
private QueryService qs;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexStatisticsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexStatisticsJUnitTest.java
index ac0a381..6a01c08 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexStatisticsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexStatisticsJUnitTest.java
@@ -42,11 +42,12 @@ import org.apache.geode.cache.query.internal.QueryObserver;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IndexStatisticsJUnitTest {
static QueryService qs;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
index 8eefd09..aaf5039 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
@@ -40,7 +40,6 @@ import org.apache.geode.cache.query.internal.IndexTrackingQueryObserver;
import org.apache.geode.cache.query.internal.IndexTrackingQueryObserver.IndexInfo;
import org.apache.geode.cache.query.internal.QueryObserver;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegionQueryEvaluator.TestHook;
@@ -53,13 +52,13 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLIndexTest.class})
public class IndexTrackingQueryObserverDUnitTest extends JUnit4CacheTestCase {
private final int NUM_BKTS = 10;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
index f5e8546..dbc2995 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
@@ -40,11 +40,12 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.internal.index.IndexTrackingQueryObserverDUnitTest.IndexTrackingTestHook;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IndexTrackingQueryObserverJUnitTest {
static QueryService qs;
static Region region;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java
index 4c6f630..0d714f0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java
@@ -51,11 +51,12 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.internal.index.IndexManager.TestHook;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IndexUseJUnitTest {
Region region;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexedMergeEquiJoinScenariosJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexedMergeEquiJoinScenariosJUnitTest.java
index 8f80765..a8b1b9a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexedMergeEquiJoinScenariosJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexedMergeEquiJoinScenariosJUnitTest.java
@@ -46,11 +46,12 @@ import org.apache.geode.cache.query.functional.StructSetOrResultsSet;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class IndexedMergeEquiJoinScenariosJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java
index ecc86ee..9a2083b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java
@@ -51,15 +51,15 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
* Test creates a local region. Creates and removes index in a parallel running thread. Then
* destroys and puts back entries in separated thread in the same region and runs query in parallel
* and checks for UNDEFINED values in result set of the query.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLIndexTest.class})
@RunWith(JUnitParamsRunner.class)
public class InitializeIndexEntryDestroyQueryDUnitTest extends JUnit4CacheTestCase {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapIndexStoreJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapIndexStoreJUnitTest.java
index f3def10..82297f1 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapIndexStoreJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapIndexStoreJUnitTest.java
@@ -40,13 +40,14 @@ import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.entries.VMThinRegionEntryHeap;
import org.apache.geode.internal.cache.persistence.query.CloseableIterator;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
* Test class that will be extended to provide the IndexStorage structure to test Tests apis of the
* IndexStorage
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class MapIndexStoreJUnitTest {
IndexStore indexDataStructure;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
index 236546f..d4f927b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
@@ -44,11 +44,12 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.IndexTrackingQueryObserver;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class MapRangeIndexMaintenanceJUnitTest {
static QueryService qs;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java
index 5c7f955..df5f513 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.cache.query.internal.QueryObserver;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.internal.index.IndexManager.TestHook;
-import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.Invoke;
@@ -42,10 +41,10 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLIndexTest.class})
public class MultiIndexCreationDUnitTest extends JUnit4CacheTestCase {
private final String regionName = "MultiIndexCreationDUnitTest";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
index 8aaad15..ca4ffac 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
@@ -39,11 +39,12 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
* @since GemFire 6.6.1
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class NewDeclarativeIndexCreationJUnitTest {
private static final String CACHE_XML_FILE_NAME = "cachequeryindex.xml";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedIndexJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedIndexJUnitTest.java
index 8d48fd9..fcd075d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedIndexJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedIndexJUnitTest.java
@@ -22,14 +22,14 @@ import static org.mockito.Mockito.when;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.IndexType;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class PartitionedIndexJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java
index 579bbb2..001ab97 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java
@@ -32,8 +32,9 @@ import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class PartitionedRegionEquiJoinIntegrationTest extends EquiJoinIntegrationTest {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
index e3c1289..5699539 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
@@ -33,8 +33,9 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.PortfolioPdx;
import org.apache.geode.pdx.ReflectionBasedAutoSerializer;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class PdxCopyOnReadQueryJUnitTest {
private Cache cache = null;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
index 272729f..12d81c7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
@@ -37,12 +37,13 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class ProgRegionCreationIndexUpdateTypeJUnitTest {
private Cache cache = null;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
index 66b0061..f1f04e4 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
@@ -45,8 +45,9 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLIndexTest.class})
public class PutAllWithIndexPerfDUnitTest extends JUnit4CacheTestCase {
/** The port on which the bridge server was started in this VM */
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/RangeIndexAPIJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/RangeIndexAPIJUnitTest.java
index 43eabb9..e529bd9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/RangeIndexAPIJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/RangeIndexAPIJUnitTest.java
@@ -48,8 +48,9 @@ import org.apache.geode.cache.query.internal.RuntimeIterator;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class RangeIndexAPIJUnitTest {
private Region region = null;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/RangeIndexMaintenanceIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/RangeIndexMaintenanceIntegrationTest.java
index 125967a..0e82ff7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/RangeIndexMaintenanceIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/RangeIndexMaintenanceIntegrationTest.java
@@ -21,8 +21,9 @@ import org.apache.geode.cache.query.IndexNameConflictException;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class RangeIndexMaintenanceIntegrationTest extends AbstractIndexMaintenanceIntegrationTest {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
index db078fd..0229366 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
@@ -43,11 +43,12 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
* TODO: most of these tests log statements instead of using assertions
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLIndexTest.class})
public class PRBasicIndexCreationDUnitTest extends CacheTestCase {
private static final String PARTITIONED_REGION_NAME = "PartionedPortfolios";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java
index 2e22ca1..393798a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java
@@ -41,8 +41,9 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLIndexTest.class})
public class PRBasicMultiIndexCreationDUnitTest extends CacheTestCase {
private final PRQueryDUnitHelper PRQHelp = new PRQueryDUnitHelper();
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicQueryDUnitTest.java
index 5462f9f..6f2e1f5 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicQueryDUnitTest.java
@@ -42,12 +42,13 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* This tests creates partition regions with 1 Datastore & 1 Accessor node, firing a simple query
* and validating the ResultSet size and Contents.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class PRBasicQueryDUnitTest extends CacheTestCase {
private static final String name = "Portfolios";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java
index ee02cea..0046ee0 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java
@@ -29,11 +29,12 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
* Basic functional test for removing index from a partitioned region system.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLIndexTest.class})
public class PRBasicRemoveIndexDUnitTest extends CacheTestCase {
private static final String name = "PartitionedPortfolios";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
index 1250d19..4a334de 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
@@ -67,8 +67,9 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class PRColocatedEquiJoinDUnitTest extends CacheTestCase {
private static final String name = "Portfolios1";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.java
index d948883..3e85a21 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.java
@@ -40,11 +40,12 @@ import org.apache.geode.cache.query.internal.index.IndexProtocol;
import org.apache.geode.cache.query.internal.index.PartitionedIndex;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class PRIndexStatisticsJUnitTest {
static QueryService qs;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryDUnitTest.java
index ba7ae94..e4c7f65 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryDUnitTest.java
@@ -27,8 +27,9 @@ import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
@SuppressWarnings("serial")
public class PRInvalidQueryDUnitTest extends CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java
index e915142..320b8d7 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java
@@ -17,15 +17,13 @@ package org.apache.geode.cache.query.partitioned;
import static org.junit.Assert.fail;
import org.junit.Before;
-import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.LogWriter;
import org.apache.geode.cache.Region;
-import org.apache.geode.cache.query.QueryInvalidException;
-import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.internal.cache.PartitionedRegionTestHelper;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* Class verifies Region#query(Select Query) API for PartitionedRegion on a single VM.,As
@@ -34,7 +32,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class PRInvalidQueryJUnitTest {
String regionName = "Portfolios";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java
index 983526f..6b8bfba 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java
@@ -34,6 +34,7 @@ import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.internal.cache.PartitionedRegionTestHelper;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* Test verifies Region#query()for PartitionedRegion on a single VM with Region#destroyRegion()
@@ -41,7 +42,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class PRQueryCacheClosedJUnitTest {
// PR Region name
static final String regionName = "portfolios";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitTest.java
index 904d730..e6a565c 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitTest.java
@@ -47,8 +47,9 @@ import org.apache.geode.internal.cache.PartitionedRegionQueryEvaluator;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
@SuppressWarnings("serial")
public class PRQueryDUnitTest extends CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java
index 41ec7c3..83168a9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java
@@ -35,13 +35,14 @@ import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.PartitionedRegionTestHelper;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* Class verifies Region#query(String predicate) API for PartitionedRegion on a single VM.
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class PRQueryJUnitTest {
String regionName = "portfolios";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java
index b6a860c..ea35e22 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java
@@ -31,13 +31,14 @@ import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.PRQueryProcessor;
import org.apache.geode.internal.cache.PartitionedRegionTestHelper;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* Class verifies Region#query(String predicate) API for PartitionedRegion on a single VM.
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class PRQueryNumThreadsJUnitTest {
String regionName = "portfolios";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryPortfolioDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryPortfolioDUnitTest.java
index f9812b2..d39f712 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryPortfolioDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryPortfolioDUnitTest.java
@@ -32,8 +32,9 @@ import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
@SuppressWarnings("serial")
public class PRQueryPortfolioDUnitTest extends CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
index e53b348..844fdf0 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
@@ -34,8 +34,9 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
@SuppressWarnings("serial")
public class PRQueryRegionCloseDUnitTest extends CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java
index 0523b78..997dde9 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java
@@ -33,6 +33,7 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.internal.cache.PartitionedRegionTestHelper;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* Test verifies Region#query()for PartitionedRegion on a single VM with Region#close() being called
@@ -40,7 +41,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class PRQueryRegionClosedJUnitTest {
static final String regionName = "portfolios";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
index 879e591..a45516f 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
@@ -32,8 +32,9 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
@SuppressWarnings("serial")
public class PRQueryRegionDestroyedDUnitTest extends CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
index e3dc7f5..050a7e1 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
@@ -34,6 +34,7 @@ import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.internal.cache.PartitionedRegionTestHelper;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* Test verifies Region#query()for PartitionedRegion on a single VM with Region#destroyRegion()
@@ -41,7 +42,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class PRQueryRegionDestroyedJUnitTest {
// PR Region name
static final String regionName = "portfolios";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
index bdfbddc..8fc29d3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
@@ -42,11 +42,12 @@ import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* This test verifies exception handling on coordinator node for remote as well as local querying.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, OQLQueryTest.class})
public class PRQueryRemoteNodeExceptionDUnitTest extends CacheTestCase {
private static final String PARTITIONED_REGION_NAME = "Portfolios";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java
index 228ec01..c963a69 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java
@@ -53,8 +53,9 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.internal.jta.CacheUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, OQLQueryTest.class})
public class QueryAndJtaJUnitTest {
private Region currRegion;
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
index 0f1699e..d51db7d 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.cache.query.dunit;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.util.ArrayList;
@@ -31,8 +32,6 @@ import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.MirrorType;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.Scope;
-import org.apache.geode.cache.client.PoolFactory;
-import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.cache.query.Index;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
@@ -43,7 +42,6 @@ import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.cache30.CacheSerializableRunnable;
-import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.cache30.CertifiableTestCacheListener;
import org.apache.geode.cache30.ClientServerTestCase;
import org.apache.geode.test.dunit.Assert;
@@ -54,9 +52,8 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
* This class tests register interest behavior on client at startup given that client has already
@@ -65,7 +62,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
*
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({DistributedTest.class, OQLIndexTest.class})
public class QueryIndexUpdateRIDUnitTest extends JUnit4CacheTestCase {
/** The port on which the bridge server was started in this VM */
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryMonitorDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryMonitorDUnitTest.java
index 9772f22..3571a76 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryMonitorDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryMonitorDUnitTest.java
@@ -15,8 +15,9 @@
package org.apache.geode.cache.query.dunit;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
@@ -37,8 +38,6 @@ import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.Scope;
-import org.apache.geode.cache.client.ClientCache;
-import org.apache.geode.cache.client.ClientCacheFactory;
import org.apache.geode.cache.client.Pool;
import org.apache.geode.cache.client.PoolFactory;
import org.apache.geode.cache.client.PoolManager;
@@ -66,16 +65,16 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* Tests for QueryMonitoring service.
*
* @since GemFire 6.0
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({DistributedTest.class, OQLQueryTest.class})
public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
private final String exampleRegionName = "exampleRegion";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/OQLIndexTest.java
old mode 100644
new mode 100755
similarity index 60%
copy from geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java
copy to geode-junit/src/main/java/org/apache/geode/test/junit/categories/OQLIndexTest.java
index c38fc12..b3ffd27
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/OQLIndexTest.java
@@ -12,25 +12,10 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.geode.cache.query.functional;
-
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.query.CacheUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+package org.apache.geode.test.junit.categories;
/**
- *
- *
+ * A test category for oql index-related tests
*/
-@Category(IntegrationTest.class)
-public class GroupByReplicatedJUnitTest extends GroupByTestImpl {
-
- @Override
- public Region createRegion(String regionName, Class valueConstraint) {
- Region r1 = CacheUtils.createRegion(regionName, valueConstraint);
- return r1;
-
- }
+public interface OQLIndexTest {
}
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/OQLQueryTest.java
old mode 100644
new mode 100755
similarity index 60%
copy from geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java
copy to geode-junit/src/main/java/org/apache/geode/test/junit/categories/OQLQueryTest.java
index c38fc12..0b77413
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/OQLQueryTest.java
@@ -12,25 +12,10 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.geode.cache.query.functional;
-
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.query.CacheUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+package org.apache.geode.test.junit.categories;
/**
- *
- *
+ * A test category for OQL query-related tests
*/
-@Category(IntegrationTest.class)
-public class GroupByReplicatedJUnitTest extends GroupByTestImpl {
-
- @Override
- public Region createRegion(String regionName, Class valueConstraint) {
- Region r1 = CacheUtils.createRegion(regionName, valueConstraint);
- return r1;
-
- }
+public interface OQLQueryTest {
}
diff --git a/gradle/test.gradle b/gradle/test.gradle
index 75fad02..c775d6e 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -200,6 +200,27 @@ subprojects {
}
reports.junitXml.destination = file "$buildDir/test-reports-client-subscription"
}
+ task queryTest(type:Test) {
+ useJUnit {
+ includeCategories 'org.apache.geode.test.junit.categories.OQLQueryTest'
+ excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
+ }
+ doFirst {
+ TestPropertiesWriter.writeTestProperties(buildDir, name)
+ }
+ reports.junitXml.destination = file "$buildDir/test-reports-oql-query"
+ }
+
+ task indexTest(type:Test) {
+ useJUnit {
+ includeCategories 'org.apache.geode.test.junit.categories.OQLIndexTest'
+ excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
+ }
+ doFirst {
+ TestPropertiesWriter.writeTestProperties(buildDir, name)
+ }
+ reports.junitXml.destination = file "$buildDir/test-reports-oql-index"
+ }
task membershipTest(type:Test) {
useJUnit {
--
To stop receiving notification emails like this one, please contact
jasonhuynh@apache.org.