Repository: incubator-ignite Updated Branches: refs/heads/ignite-709 ecbc23874 -> 8c2d8d96b
ignite-709: improved one test, added all the tests to a suite Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8c2d8d96 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8c2d8d96 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8c2d8d96 Branch: refs/heads/ignite-709 Commit: 8c2d8d96bc5f15a46f94a2c03196545f96134b48 Parents: ecbc238 Author: Denis Magda <[email protected]> Authored: Mon Apr 13 11:11:27 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Mon Apr 13 11:11:27 2015 +0300 ---------------------------------------------------------------------- ...acheTcpClientDiscoveryMultiThreadedTest.java | 62 +++++++++++--------- .../IgniteCacheTcpClientDiscoveryTestSuite.java | 41 +++++++++++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 3 + 3 files changed, 77 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c2d8d96/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java index 8bf55f9..b97baf1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java @@ -105,50 +105,54 @@ public class GridCacheTcpClientDiscoveryMultiThreadedTest extends GridCacheAbstr client = true; - startGridsMultiThreaded(srvNodesCnt, clientNodesCnt); + for (int n = 0; n < 3; n++) { - checkTopology(gridCount()); + startGridsMultiThreaded(srvNodesCnt, clientNodesCnt); + + checkTopology(gridCount()); - awaitPartitionMapExchange(); + awaitPartitionMapExchange(); - // Explicitly create near cache for even client nodes - for (int i = srvNodesCnt; i < gridCount(); i++) - grid(i).createNearCache(null, new NearCacheConfiguration<>()); + // Explicitly create near cache for even client nodes + for (int i = srvNodesCnt; i < gridCount(); i++) + grid(i).createNearCache(null, new NearCacheConfiguration<>()); - final AtomicInteger threadsCnt = new AtomicInteger(); + final AtomicInteger threadsCnt = new AtomicInteger(); - IgniteInternalFuture<?> f = multithreadedAsync( - new Callable<Object>() { - @Override public Object call() throws Exception { - int clientIdx = srvNodesCnt + threadsCnt.getAndIncrement(); + IgniteInternalFuture<?> f = multithreadedAsync( + new Callable<Object>() { + @Override + public Object call() throws Exception { + int clientIdx = srvNodesCnt + threadsCnt.getAndIncrement(); - Ignite node = grid(clientIdx); + Ignite node = grid(clientIdx); - assert node.configuration().isClientMode(); + assert node.configuration().isClientMode(); - IgniteCache<Integer, Integer> cache = node.cache(null); + IgniteCache<Integer, Integer> cache = node.cache(null); - boolean isNearCacheNode = clientIdx % 2 == 0; + boolean isNearCacheNode = clientIdx % 2 == 0; - for (int i = 100 * clientIdx; i < 100 * (clientIdx + 1); i++) - cache.put(i, i); + for (int i = 100 * clientIdx; i < 100 * (clientIdx + 1); i++) + cache.put(i, i); - for (int i = 100 * clientIdx; i < 100 * (clientIdx + 1); i++) { - assertEquals(i, (int)cache.get(i)); + for (int i = 100 * clientIdx; i < 100 * (clientIdx + 1); i++) { + assertEquals(i, (int) cache.get(i)); - if (isNearCacheNode) - assertEquals(i, (int)cache.localPeek(i, CachePeekMode.ONHEAP)); - } + if (isNearCacheNode) + assertEquals(i, (int) cache.localPeek(i, CachePeekMode.ONHEAP)); + } - stopGrid(clientIdx); + stopGrid(clientIdx); - return null; - } - }, - clientNodesCnt - ); + return null; + } + }, + clientNodesCnt + ); - f.get(); + f.get(); + } } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c2d8d96/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTcpClientDiscoveryTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTcpClientDiscoveryTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTcpClientDiscoveryTestSuite.java new file mode 100644 index 0000000..94ed0a4 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTcpClientDiscoveryTestSuite.java @@ -0,0 +1,41 @@ +/* + * 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.*; +import org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.internal.processors.cache.distributed.*; + +/** + * Tests a cache with TcpClientDiscovery SPI being enabled. + */ +public class IgniteCacheTcpClientDiscoveryTestSuite { + /** + * @return Suite. + * @throws Exception If failed. + */ + public static TestSuite suite() throws Exception { + TestSuite suite = new TestSuite("Cache + TcpClientDiscovery SPI test suite."); + + suite.addTest(new TestSuite(GridCacheClientOnlyTcpClientDiscoveryTest.class)); + suite.addTest(new TestSuite(GridCacheNearOnlyTcpClientDiscoveryTest.class)); + suite.addTest(new TestSuite(GridCacheTcpClientDiscoveryMultiThreadedTest.class)); + + return suite; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c2d8d96/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java index e167614..95953a9 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java @@ -353,6 +353,9 @@ public class IgniteCacheTestSuite extends TestSuite { // Cache interceptor tests. suite.addTest(IgniteCacheInterceptorSelfTestSuite.suite()); + // Cache + TcpClientDiscovery SPI tests. + suite.addTest(IgniteCacheTcpClientDiscoveryTestSuite.suite()); + // Multi node update. suite.addTestSuite(GridCacheMultinodeUpdateSelfTest.class); // TODO: GG-5353.
