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 584A717B84 for ; Thu, 7 May 2015 13:26:37 +0000 (UTC) Received: (qmail 18704 invoked by uid 500); 7 May 2015 13:26:37 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 18673 invoked by uid 500); 7 May 2015 13:26:37 -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 18663 invoked by uid 99); 7 May 2015 13:26:37 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 May 2015 13:26:37 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id CB3ADC009B for ; Thu, 7 May 2015 13:26:36 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id ICDkfLhHAkve for ; Thu, 7 May 2015 13:26:35 +0000 (UTC) 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 39B1425327 for ; Thu, 7 May 2015 13:26:33 +0000 (UTC) Received: (qmail 18645 invoked by uid 99); 7 May 2015 13:26:33 -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; Thu, 07 May 2015 13:26:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DA9AAE4425; Thu, 7 May 2015 13:26:32 +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: Thu, 07 May 2015 13:26:34 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/6] incubator-ignite git commit: Minor tests fix Minor tests fix Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/29da67ce Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/29da67ce Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/29da67ce Branch: refs/heads/ignite-836_2 Commit: 29da67ce0bbee3c7837126423a6290a6cc2a22cf Parents: 61808ed Author: agura Authored: Thu May 7 15:18:34 2015 +0300 Committer: agura Committed: Thu May 7 15:18:34 2015 +0300 ---------------------------------------------------------------------- ...CacheLoadingConcurrentGridStartSelfTest.java | 49 ++++++++++++-------- 1 file changed, 29 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/29da67ce/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLoadingConcurrentGridStartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLoadingConcurrentGridStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLoadingConcurrentGridStartSelfTest.java index 74273d1..798494f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLoadingConcurrentGridStartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLoadingConcurrentGridStartSelfTest.java @@ -30,6 +30,7 @@ import org.jetbrains.annotations.*; import javax.cache.*; import javax.cache.configuration.*; import javax.cache.integration.*; +import java.io.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheMode.*; @@ -55,26 +56,7 @@ public class CacheLoadingConcurrentGridStartSelfTest extends GridCommonAbstractT ccfg.setBackups(1); - CacheStore store = new CacheStoreAdapter() { - @Override public void loadCache(IgniteBiInClosure f, Object... args) { - for (int i = 0; i < KEYS_CNT; i++) - f.apply(i, Integer.toString(i)); - } - - @Nullable @Override public String load(Integer i) throws CacheLoaderException { - return null; - } - - @Override public void write(Cache.Entry entry) throws CacheWriterException { - // No-op. - } - - @Override public void delete(Object o) throws CacheWriterException { - // No-op. - } - }; - - ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); + ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(new TestCacheStoreAdapter())); cfg.setCacheConfiguration(ccfg); @@ -151,4 +133,31 @@ public class CacheLoadingConcurrentGridStartSelfTest extends GridCommonAbstractT assertEquals(KEYS_CNT, total); } + + /** + * Cache store adapter. + */ + private static class TestCacheStoreAdapter extends CacheStoreAdapter implements Serializable { + /** {@inheritDoc} */ + @Override public void loadCache(IgniteBiInClosure f, Object... args) { + for (int i = 0; i < KEYS_CNT; i++) + f.apply(i, Integer.toString(i)); + } + + /** {@inheritDoc} */ + @Nullable @Override public String load(Integer i) throws CacheLoaderException { + return null; + } + + /** {@inheritDoc} */ + @Override public void write(Cache.Entry entry) + throws CacheWriterException { + // No-op. + } + + /** {@inheritDoc} */ + @Override public void delete(Object o) throws CacheWriterException { + // No-op. + } + } }