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 E91CD18AB3 for ; Wed, 9 Dec 2015 11:23:44 +0000 (UTC) Received: (qmail 16276 invoked by uid 500); 9 Dec 2015 11:23:44 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 16161 invoked by uid 500); 9 Dec 2015 11:23:44 -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 15705 invoked by uid 99); 9 Dec 2015 11:23:44 -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, 09 Dec 2015 11:23:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E5A62E0B39; Wed, 9 Dec 2015 11:23:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Date: Wed, 09 Dec 2015 11:24:03 -0000 Message-Id: <5da6b3ac46484cc7b4feeee492d23d75@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [21/51] [abbrv] ignite git commit: 2064 Test hotfix 2064 Test hotfix Signed-off-by: Anton Vinogradov Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/11b42629 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/11b42629 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/11b42629 Branch: refs/heads/ignite-843-rc2 Commit: 11b426297cffcb98b6dd374cfc88184b2b04246f Parents: 233231d Author: Anton Vinogradov Authored: Fri Dec 4 19:34:46 2015 +0300 Committer: Anton Vinogradov Committed: Mon Dec 7 13:08:39 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java | 6 +++++- .../apache/ignite/testframework/config/GridTestProperties.java | 3 +++ .../ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/11b42629/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java index 0873d2d..35ee6cc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java @@ -30,6 +30,7 @@ import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.config.GridTestProperties; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; @@ -45,7 +46,10 @@ public class GridCacheAtomicEntryProcessorDeploymentSelfTest extends GridCommonA private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Entry processor */ - protected static String TEST_ENT_PROCESSOR = "org.apache.ignite.tests.p2p.CacheDeploymentEntryProcessor"; + protected static String TEST_ENT_PROCESSOR = + GridTestProperties.getProperty(GridTestProperties.ENTRY_PROCESSOR_CLASS_NAME) != null ? + GridTestProperties.getProperty(GridTestProperties.ENTRY_PROCESSOR_CLASS_NAME) : + "org.apache.ignite.tests.p2p.CacheDeploymentEntryProcessor"; /** Test value. */ protected static String TEST_VALUE = "org.apache.ignite.tests.p2p.CacheDeploymentTestValue"; http://git-wip-us.apache.org/repos/asf/ignite/blob/11b42629/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java index 1ea8c38..491f38f 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java @@ -72,6 +72,9 @@ public final class GridTestProperties { /** */ public static final String MARSH_CLASS_NAME = "marshaller.class"; + /** */ + public static final String ENTRY_PROCESSOR_CLASS_NAME = "entry.processor.class"; + /** Binary marshaller compact footers property. */ public static final String BINARY_COMPACT_FOOTERS = "binary.marshaller.compact.footers"; http://git-wip-us.apache.org/repos/asf/ignite/blob/11b42629/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java index 2778c97..3d25645 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java @@ -31,6 +31,8 @@ public class IgniteBinaryObjectsCacheTestSuite3 { */ public static TestSuite suite() throws Exception { GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); + GridTestProperties.setProperty(GridTestProperties.ENTRY_PROCESSOR_CLASS_NAME, + "org.apache.ignite.tests.p2p.CacheDeploymentPortableEntryProcessor"); return IgniteCacheTestSuite3.suite(); }