Divide test suite.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9e84e508 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9e84e508 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9e84e508 Branch: refs/heads/gridgain-7.5.11-vk Commit: 9e84e508a394b790ef046cdcf2a015bcf853c064 Parents: 60e7461 Author: nikolay_tikhonov <[email protected]> Authored: Mon Mar 28 16:59:56 2016 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Mon Mar 28 16:59:56 2016 +0300 ---------------------------------------------------------------------- ...acheContinuousQueryRandomOperationsTest.java | 8 ++-- .../IgniteBinaryCacheQueryTestSuite4.java | 39 ++++++++++++++++ .../IgniteCacheQuerySelfTestSuite3.java | 12 ----- .../IgniteCacheQuerySelfTestSuite4.java | 49 ++++++++++++++++++++ 4 files changed, 92 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9e84e508/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java index b1316ab..e9fbf70 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java @@ -146,13 +146,13 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract * @throws Exception If failed. */ public void testFilterAndFactoryProvided() throws Exception { - CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, + final CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 1, ATOMIC, ONHEAP_TIERED, false); - final IgniteCache<Object, Object> cache = grid(0).getOrCreateCache(ccfg); + grid(0).createCache(ccfg); try { final ContinuousQuery qry = new ContinuousQuery(); @@ -177,13 +177,13 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { - return cache.query(qry); + return grid(0).cache(ccfg.getName()).query(qry); } }, IgniteException.class, null); } finally { - cache.destroy(); + grid(0).destroyCache(ccfg.getName()); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/9e84e508/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite4.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite4.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite4.java new file mode 100644 index 0000000..32a693f --- /dev/null +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite4.java @@ -0,0 +1,39 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.testsuites; + +import junit.framework.TestSuite; +import org.apache.ignite.internal.binary.BinaryMarshaller; +import org.apache.ignite.testframework.config.GridTestProperties; + +/** + * Cache query suite with binary marshaller. + */ +public class IgniteBinaryCacheQueryTestSuite4 extends TestSuite { + /** + * @return Suite. + * @throws Exception In case of error. + */ + public static TestSuite suite() throws Exception { + GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); + + TestSuite suite = IgniteCacheQuerySelfTestSuite4.suite(); + + return suite; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/9e84e508/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java index 6e9d0f6..73c856b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java @@ -21,12 +21,6 @@ import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousBatchAckTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousBatchForceServerModeAckTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFactoryFilterTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicPrimaryWriteOrderOffheapTieredTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicReplicatedSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverTxOffheapTieredTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverTxReplicatedSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverTxSelfTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryOperationP2PTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryRandomOperationsTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryRandomOperationsTwoNodesTest; @@ -90,12 +84,6 @@ public class IgniteCacheQuerySelfTestSuite3 extends TestSuite { suite.addTestSuite(IgniteCacheContinuousQueryClientTest.class); suite.addTestSuite(IgniteCacheContinuousQueryClientReconnectTest.class); suite.addTestSuite(IgniteCacheContinuousQueryClientTxReconnectTest.class); - suite.addTestSuite(CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest.class); - suite.addTestSuite(CacheContinuousQueryFailoverAtomicReplicatedSelfTest.class); - suite.addTestSuite(CacheContinuousQueryFailoverTxSelfTest.class); - suite.addTestSuite(CacheContinuousQueryFailoverTxReplicatedSelfTest.class); - suite.addTestSuite(CacheContinuousQueryFailoverAtomicPrimaryWriteOrderOffheapTieredTest.class); - suite.addTestSuite(CacheContinuousQueryFailoverTxOffheapTieredTest.class); suite.addTestSuite(CacheContinuousQueryRandomOperationsTest.class); suite.addTestSuite(CacheContinuousQueryRandomOperationsTwoNodesTest.class); suite.addTestSuite(CacheContinuousQueryFactoryFilterTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/9e84e508/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java new file mode 100644 index 0000000..fa4e642 --- /dev/null +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java @@ -0,0 +1,49 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.testsuites; + +import junit.framework.TestSuite; +import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicPrimaryWriteOrderOffheapTieredTest; +import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest; +import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicReplicatedSelfTest; +import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverTxOffheapTieredTest; +import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverTxReplicatedSelfTest; +import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverTxSelfTest; + +/** + * Test suite for cache queries. + */ +public class IgniteCacheQuerySelfTestSuite4 extends TestSuite { + /** + * @return Test suite. + * @throws Exception If failed. + */ + public static TestSuite suite() throws Exception { + TestSuite suite = new TestSuite("Ignite Cache Queries Test Suite 4"); + + // Continuous queries failover tests. + suite.addTestSuite(CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest.class); + suite.addTestSuite(CacheContinuousQueryFailoverAtomicReplicatedSelfTest.class); + suite.addTestSuite(CacheContinuousQueryFailoverTxSelfTest.class); + suite.addTestSuite(CacheContinuousQueryFailoverTxReplicatedSelfTest.class); + suite.addTestSuite(CacheContinuousQueryFailoverAtomicPrimaryWriteOrderOffheapTieredTest.class); + suite.addTestSuite(CacheContinuousQueryFailoverTxOffheapTieredTest.class); + + return suite; + } +}
