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 E6C8417521 for ; Mon, 2 Mar 2015 15:03:43 +0000 (UTC) Received: (qmail 84660 invoked by uid 500); 2 Mar 2015 15:03:43 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 84607 invoked by uid 500); 2 Mar 2015 15:03:43 -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 84586 invoked by uid 99); 2 Mar 2015 15:03:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2015 15:03:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 02 Mar 2015 15:03:42 +0000 Received: (qmail 82444 invoked by uid 99); 2 Mar 2015 15:03:17 -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; Mon, 02 Mar 2015 15:03:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 299EAE07EC; Mon, 2 Mar 2015 15:03:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 02 Mar 2015 15:03:51 -0000 Message-Id: <6890bd59a020433095927661863b544f@git.apache.org> In-Reply-To: <336f92e319b84e5dacd27ca1cd563d54@git.apache.org> References: <336f92e319b84e5dacd27ca1cd563d54@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [36/50] incubator-ignite git commit: Improve IgniteCacheExpiryPolicyAbstractTest. X-Virus-Checked: Checked by ClamAV on apache.org Improve IgniteCacheExpiryPolicyAbstractTest. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0086e9cd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0086e9cd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0086e9cd Branch: refs/heads/ignite-237 Commit: 0086e9cd2ab652d58adc4edf016932388de9686a Parents: c847e88 Author: sevdokimov Authored: Mon Mar 2 14:23:19 2015 +0300 Committer: sevdokimov Committed: Mon Mar 2 14:25:02 2015 +0300 ---------------------------------------------------------------------- .../IgniteCacheExpiryPolicyAbstractTest.java | 38 ++------------------ 1 file changed, 3 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0086e9cd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java index 3110cbc..e04659c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java @@ -103,23 +103,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs * @throws Exception If failed. */ public void testZeroOnUpdate() throws Exception { - factory = new Factory() { - @Override public ExpiryPolicy create() { - return new ExpiryPolicy() { - @Override public Duration getExpiryForCreation() { - return null; - } - - @Override public Duration getExpiryForAccess() { - return null; - } - - @Override public Duration getExpiryForUpdate() { - return Duration.ZERO; - } - }; - } - }; + factory = new FactoryBuilder.SingletonFactory<>(new TestPolicy(null, 0L, null)); startGrids(); @@ -150,23 +134,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs * @throws Exception If failed. */ public void testZeroOnAccess() throws Exception { - factory = new Factory() { - @Override public ExpiryPolicy create() { - return new ExpiryPolicy() { - @Override public Duration getExpiryForCreation() { - return null; - } - - @Override public Duration getExpiryForAccess() { - return Duration.ZERO; - } - - @Override public Duration getExpiryForUpdate() { - return null; - } - }; - } - }; + factory = new FactoryBuilder.SingletonFactory<>(new TestPolicy(null, null, 0L)); startGrids(); @@ -1087,7 +1055,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs /** * */ - private class TestPolicy implements ExpiryPolicy { + private static class TestPolicy implements ExpiryPolicy { /** */ private Long create;