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 19AE218952 for ; Wed, 13 May 2015 08:25:59 +0000 (UTC) Received: (qmail 80466 invoked by uid 500); 13 May 2015 08:25:59 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 80436 invoked by uid 500); 13 May 2015 08:25:59 -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 80426 invoked by uid 99); 13 May 2015 08:25:58 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 May 2015 08:25:58 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 82E7FC46F2 for ; Wed, 13 May 2015 08:25:58 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 1KcC5rcj-ORe for ; Wed, 13 May 2015 08:25:46 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id DABB8262BF for ; Wed, 13 May 2015 08:25:41 +0000 (UTC) Received: (qmail 77727 invoked by uid 99); 13 May 2015 08:24:26 -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; Wed, 13 May 2015 08:24:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BB52EE301A; Wed, 13 May 2015 08:24:26 +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: Wed, 13 May 2015 08:24:47 -0000 Message-Id: <0d5814204e2c476ea16b429c6bf7bc60@git.apache.org> In-Reply-To: <662663cb38e54c25b7a8de13e70682f7@git.apache.org> References: <662663cb38e54c25b7a8de13e70682f7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [22/23] incubator-ignite git commit: # ignite-835 # ignite-835 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9e670b8f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9e670b8f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9e670b8f Branch: refs/heads/ignite-835 Commit: 9e670b8f59dc8b758dc8944885adf739d847e9c9 Parents: ade75f9 Author: sboikov Authored: Wed May 13 11:22:12 2015 +0300 Committer: sboikov Committed: Wed May 13 11:22:12 2015 +0300 ---------------------------------------------------------------------- ...achePartitionedNearDisabledLockSelfTest.java | 47 ++++++++++++++++++++ .../GridCacheReplicatedLockSelfTest.java | 5 +++ .../testsuites/IgniteCacheTestSuite2.java | 1 + 3 files changed, 53 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9e670b8f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledLockSelfTest.java new file mode 100644 index 0000000..69c7909 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledLockSelfTest.java @@ -0,0 +1,47 @@ +/* + * 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.internal.processors.cache.distributed.dht; + +import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.processors.cache.distributed.near.*; + +/** + * + */ +public class GridCachePartitionedNearDisabledLockSelfTest extends GridCachePartitionedLockSelfTest { + /** {@inheritDoc} */ + @Override protected CacheConfiguration cacheConfiguration() { + CacheConfiguration ccfg = super.cacheConfiguration(); + + assertNotNull(ccfg.getNearConfiguration()); + + ccfg.setNearConfiguration(null); + + return ccfg; + } + + /** {@inheritDoc} */ + @Override protected boolean isPartitioned() { + return false; + } + + /** {@inheritDoc} */ + @Override public void testLockReentrancy() throws Throwable { + fail("https://issues.apache.org/jira/browse/IGNITE-835"); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9e670b8f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedLockSelfTest.java index 97df1f0..510fa0c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedLockSelfTest.java @@ -30,4 +30,9 @@ public class GridCacheReplicatedLockSelfTest extends GridCacheLockAbstractTest { @Override protected CacheMode cacheMode() { return REPLICATED; } + + /** {@inheritDoc} */ + @Override public void testLockReentrancy() throws Throwable { + fail("https://issues.apache.org/jira/browse/IGNITE-835"); + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9e670b8f/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java index dfd88a8..dc3a2c0 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java @@ -76,6 +76,7 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTest(new TestSuite(GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedEventSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedLockSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedNearDisabledLockSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedMultiNodeLockSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedMultiNodeSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedMultiThreadedPutGetSelfTest.class));