Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1D516101E8 for ; Tue, 5 May 2015 13:47:29 +0000 (UTC) Received: (qmail 14738 invoked by uid 500); 5 May 2015 13:47:29 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 14708 invoked by uid 500); 5 May 2015 13:47:29 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 14699 invoked by uid 99); 5 May 2015 13:47:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 May 2015 13:47:29 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [54.76.25.247] (HELO mx1-eu-west.apache.org) (54.76.25.247) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 May 2015 13:47:00 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 5392D24B3B for ; Tue, 5 May 2015 13:46:58 +0000 (UTC) Received: (qmail 11488 invoked by uid 99); 5 May 2015 13:46:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 May 2015 13:46:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C0670E10A3; Tue, 5 May 2015 13:46:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sevdokimov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 05 May 2015 13:47:05 -0000 Message-Id: <3a3e8ea65b094bd99b532a7245414732@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/11] incubator-ignite git commit: # Minor tests refactoring. X-Virus-Checked: Checked by ClamAV on apache.org # Minor tests refactoring. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5f8f6f46 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5f8f6f46 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5f8f6f46 Branch: refs/heads/ignite-836_2 Commit: 5f8f6f46dbba461e43dc23a292a2b0ff764f19dd Parents: 57ab09e Author: vozerov-gridgain Authored: Tue May 5 12:10:21 2015 +0300 Committer: vozerov-gridgain Committed: Tue May 5 12:10:21 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheSwapReloadSelfTest.java | 20 ++++++++++++++------ .../cache/IgniteCachePeekModesAbstractTest.java | 15 ++++++++++++--- ...idFileSwapSpaceSpiMultithreadedLoadTest.java | 4 ++-- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 11 ++++++++++- .../cache/GridCacheOffHeapSelfTest.java | 11 ++++++++++- 5 files changed, 48 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f8f6f46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java index 78f01f0..7d4eefc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java @@ -24,7 +24,6 @@ import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; -import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -35,7 +34,6 @@ import org.apache.ignite.spi.swapspace.file.*; import org.apache.ignite.testframework.junits.common.*; import javax.cache.*; -import javax.cache.configuration.*; import java.util.*; import java.util.concurrent.*; @@ -51,6 +49,18 @@ public class GridCacheSwapReloadSelfTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + /** + * Creates swap space spi. + * @return The swap spi. + */ + protected SwapSpaceSpi spi() { + FileSwapSpaceSpi swap = new FileSwapSpaceSpi(); + + swap.setWriteBufferSize(1); + + return swap; + } + /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -62,11 +72,9 @@ public class GridCacheSwapReloadSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(disco); - FileSwapSpaceSpi swap = new FileSwapSpaceSpi(); - - swap.setWriteBufferSize(1); + SwapSpaceSpi spi = spi(); - cfg.setSwapSpaceSpi(swap); + cfg.setSwapSpaceSpi(spi); CacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f8f6f46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java index c2eb56f..7cd8414 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java @@ -26,6 +26,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.spi.*; +import org.apache.ignite.spi.swapspace.*; import org.apache.ignite.spi.swapspace.file.*; import javax.cache.*; @@ -54,11 +55,19 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setSwapSpaceSpi(new FileSwapSpaceSpi()); + cfg.setSwapSpaceSpi(spi()); return cfg; } + /** + * Creates a SwapSpaceSpi. + * @return the Spi + */ + protected SwapSpaceSpi spi() { + return new FileSwapSpaceSpi(); + } + /** {@inheritDoc} */ @Override protected NearCacheConfiguration nearConfiguration() { return null; @@ -231,7 +240,7 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra for (Integer key : keys) cache0.put(key, val); - FileSwapSpaceSpi swap = (FileSwapSpaceSpi)ignite(nodeIdx).configuration().getSwapSpaceSpi(); + SwapSpaceSpi swap = ignite(nodeIdx).configuration().getSwapSpaceSpi(); Set swapKeys = new HashSet<>(); @@ -614,7 +623,7 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra * @return Tuple with primary and backup keys. */ private T2, List> swapKeys(int nodeIdx) { - FileSwapSpaceSpi swap = (FileSwapSpaceSpi)ignite(nodeIdx).configuration().getSwapSpaceSpi(); + SwapSpaceSpi swap = ignite(nodeIdx).configuration().getSwapSpaceSpi(); IgniteSpiCloseableIterator it = swap.keyIterator(SPACE_NAME, null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f8f6f46/modules/core/src/test/java/org/apache/ignite/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java index abd80e1..d21fb13 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java @@ -49,7 +49,7 @@ public class GridFileSwapSpaceSpiMultithreadedLoadTest extends GridCommonAbstrac private static final long MAX_ENTRIES = 9000000; /** Test duration. */ - private static final long DURATION = 10 * 60 * 1000; + private static final long DURATION = 2 * 60 * 1000; /** Swap context. */ private final SwapContext swapCtx = new SwapContext(); @@ -73,7 +73,7 @@ public class GridFileSwapSpaceSpiMultithreadedLoadTest extends GridCommonAbstrac /** * @return An SPI instance to test. */ - private SwapSpaceSpi spi() { + protected SwapSpaceSpi spi() { FileSwapSpaceSpi spi = new FileSwapSpaceSpi(); // spi.setConcurrencyLevel(N_THREADS); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f8f6f46/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java index 226f0fc..0c55551 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java @@ -30,6 +30,7 @@ import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; +import org.apache.ignite.spi.swapspace.*; import org.apache.ignite.spi.swapspace.file.*; import org.apache.ignite.testframework.junits.common.*; @@ -79,6 +80,14 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { /** */ private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + /** + * Creates a SwapSpaceSpi. + * @return the Spi + */ + protected SwapSpaceSpi spi() { + return new FileSwapSpaceSpi(); + } + /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); @@ -91,7 +100,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { cfg.setNetworkTimeout(2000); - cfg.setSwapSpaceSpi(new FileSwapSpaceSpi()); + cfg.setSwapSpaceSpi(spi()); CacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f8f6f46/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java index 460a64c..2d6855e 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java @@ -29,6 +29,7 @@ import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; +import org.apache.ignite.spi.swapspace.*; import org.apache.ignite.spi.swapspace.file.*; import org.apache.ignite.testframework.junits.common.*; @@ -65,6 +66,14 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { /** PeerClassLoadingLocalClassPathExclude enable. */ private boolean excluded; + /** + * Creates a SwapSpaceSpi. + * @return the Spi + */ + protected SwapSpaceSpi spi() { + return new FileSwapSpaceSpi(); + } + /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); @@ -77,7 +86,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { cfg.setNetworkTimeout(2000); - cfg.setSwapSpaceSpi(new FileSwapSpaceSpi()); + cfg.setSwapSpaceSpi(spi()); CacheConfiguration cacheCfg = defaultCacheConfiguration();