From 17b75ae608bfba175321bb39901769c92b1b56ba Mon Sep 17 00:00:00 2001 From: "S.Vladykin" Date: Thu, 26 Feb 2015 02:48:13 +0300 Subject: [PATCH] ignite-sql-tests - tests --- .../GridCacheAbstractReduceFieldsQuerySelfTest.java | 9 ++++++--- .../GridCacheReduceFieldsQueryAtomicSelfTest.java | 2 +- .../GridCacheReduceFieldsQueryLocalSelfTest.java | 2 +- .../GridCacheReduceFieldsQueryPartitionedSelfTest.java | 3 +-- .../GridCacheReduceFieldsQueryReplicatedSelfTest.java | 2 +- .../ignite/testsuites/IgniteCacheQuerySelfTestSuite.java | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) rename modules/{core/src/test/java/org/apache/ignite/internal/processors/cache/query => indexing/src/test/java/org/apache/ignite/internal/processors/cache}/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java (97%) rename modules/{core/src/test/java/org/apache/ignite/internal/processors/cache/query => indexing/src/test/java/org/apache/ignite/internal/processors/cache}/reducefields/GridCacheReduceFieldsQueryAtomicSelfTest.java (95%) rename modules/{core/src/test/java/org/apache/ignite/internal/processors/cache/query => indexing/src/test/java/org/apache/ignite/internal/processors/cache}/reducefields/GridCacheReduceFieldsQueryLocalSelfTest.java (94%) rename modules/{core/src/test/java/org/apache/ignite/internal/processors/cache/query => indexing/src/test/java/org/apache/ignite/internal/processors/cache}/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java (93%) rename modules/{core/src/test/java/org/apache/ignite/internal/processors/cache/query => indexing/src/test/java/org/apache/ignite/internal/processors/cache}/reducefields/GridCacheReduceFieldsQueryReplicatedSelfTest.java (94%) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java similarity index 97% rename from modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java rename to modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java index 63143f3a99ea6..6afdb34aae0f5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.internal.processors.cache.query.reducefields; +package org.apache.ignite.internal.processors.cache.reducefields; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; @@ -80,7 +80,7 @@ protected CacheDistributionMode distributionMode() { * @return Cache. */ private CacheConfiguration cache(@Nullable String name) { - CacheConfiguration cache = defaultCacheConfiguration(); + CacheConfiguration cache = defaultCacheConfiguration(); cache.setName(name); cache.setCacheMode(cacheMode()); @@ -89,7 +89,10 @@ private CacheConfiguration cache(@Nullable String name) { cache.setWriteSynchronizationMode(FULL_SYNC); cache.setPreloadMode(SYNC); cache.setQueryIndexEnabled(true); - cache.setIndexedTypes(); + cache.setIndexedTypes( + String.class, Organization.class, + CacheAffinityKey.class, Person.class + ); if (cacheMode() == PARTITIONED) cache.setBackups(1); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryAtomicSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryAtomicSelfTest.java similarity index 95% rename from modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryAtomicSelfTest.java rename to modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryAtomicSelfTest.java index 3100f2c4be9fa..fd93a3ebefc9e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryAtomicSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryAtomicSelfTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.internal.processors.cache.query.reducefields; +package org.apache.ignite.internal.processors.cache.reducefields; import org.apache.ignite.cache.*; diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryLocalSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryLocalSelfTest.java similarity index 94% rename from modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryLocalSelfTest.java rename to modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryLocalSelfTest.java index 24760be632597..9253821f5bc18 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryLocalSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryLocalSelfTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.internal.processors.cache.query.reducefields; +package org.apache.ignite.internal.processors.cache.reducefields; import org.apache.ignite.cache.*; diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java similarity index 93% rename from modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java rename to modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java index c191be7a15274..38375373f4502 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java @@ -15,11 +15,10 @@ * limitations under the License. */ -package org.apache.ignite.internal.processors.cache.query.reducefields; +package org.apache.ignite.internal.processors.cache.reducefields; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.query.*; -import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryReplicatedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryReplicatedSelfTest.java similarity index 94% rename from modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryReplicatedSelfTest.java rename to modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryReplicatedSelfTest.java index 64a9bef57608c..5abe8593882f0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryReplicatedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheReduceFieldsQueryReplicatedSelfTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.internal.processors.cache.query.reducefields; +package org.apache.ignite.internal.processors.cache.reducefields; import org.apache.ignite.cache.*; diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java index 8edce6cc62572..dcf49143d4fa1 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java @@ -24,7 +24,7 @@ import org.apache.ignite.internal.processors.cache.local.*; import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.processors.cache.query.continuous.*; -import org.apache.ignite.internal.processors.cache.query.reducefields.*; +import org.apache.ignite.internal.processors.cache.reducefields.*; import org.apache.ignite.internal.processors.query.h2.sql.*; import org.apache.ignite.spi.communication.tcp.*;