Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4DB7E200C55 for ; Thu, 13 Apr 2017 10:43:35 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4C645160B98; Thu, 13 Apr 2017 08:43:35 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 94847160B8B for ; Thu, 13 Apr 2017 10:43:34 +0200 (CEST) Received: (qmail 81088 invoked by uid 500); 13 Apr 2017 08:43:33 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 81078 invoked by uid 99); 13 Apr 2017 08:43: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, 13 Apr 2017 08:43:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5A6B7DFC00; Thu, 13 Apr 2017 08:43:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Message-Id: <45bff918a59d41d48bd74cb5fc3ac733@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: ignite-4932 WIP Date: Thu, 13 Apr 2017 08:43:33 +0000 (UTC) archived-at: Thu, 13 Apr 2017 08:43:35 -0000 Repository: ignite Updated Branches: refs/heads/ignite-4932 e13c0e1b8 -> 82956636f ignite-4932 WIP Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/82956636 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/82956636 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/82956636 Branch: refs/heads/ignite-4932 Commit: 82956636fcf0ae541905db546f93ac72eff3d1d6 Parents: e13c0e1 Author: sboikov Authored: Thu Apr 13 11:43:19 2017 +0300 Committer: sboikov Committed: Thu Apr 13 11:43:19 2017 +0300 ---------------------------------------------------------------------- .../rest/JettyRestProcessorAbstractSelfTest.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/82956636/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java index 8d3ab74..9d8a93f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java @@ -56,6 +56,7 @@ import org.apache.ignite.internal.processors.cache.query.GridCacheSqlIndexMetada import org.apache.ignite.internal.processors.cache.query.GridCacheSqlMetadata; import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandler; import org.apache.ignite.internal.processors.rest.protocols.http.jetty.GridJettyObjectMapper; +import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.lang.GridTuple3; import org.apache.ignite.internal.util.typedef.C1; import org.apache.ignite.internal.util.typedef.F; @@ -702,6 +703,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro Thread.sleep(2100); + waitExpired("putKey"); + assertNull(jcache().get("putKey")); } @@ -733,6 +736,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro Thread.sleep(2100); + waitExpired("addKey"); + assertNull(jcache().get("addKey")); } @@ -865,6 +870,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro // Use larger value to avoid false positives. Thread.sleep(2100); + waitExpired("replaceKey"); + assertNull(jcache().get("replaceKey")); } @@ -2270,6 +2277,18 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro } } + /** + * @param key Key. + * @throws Exception Exception. + */ + private void waitExpired(final Object key) throws Exception { + GridTestUtils.waitForCondition(new GridAbsPredicate() { + @Override public boolean apply() { + return jcache().get(key) == null; + } + }, 5000); + } + /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName);