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 3F30C200C84 for ; Mon, 29 May 2017 09:56:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3DD92160BE4; Mon, 29 May 2017 07:56:30 +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 84863160BC2 for ; Mon, 29 May 2017 09:56:29 +0200 (CEST) Received: (qmail 47586 invoked by uid 500); 29 May 2017 07:56:28 -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 47573 invoked by uid 99); 29 May 2017 07:56:28 -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, 29 May 2017 07:56:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 90AF2E03B3; Mon, 29 May 2017 07:56:28 +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 Date: Mon, 29 May 2017 07:56:29 -0000 Message-Id: <98423bcf8d09410f92b85b627ecf75cc@git.apache.org> In-Reply-To: <4347bae0bac64f7ca0239a3db249ec84@git.apache.org> References: <4347bae0bac64f7ca0239a3db249ec84@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/12] ignite git commit: ignite-gg-12138 stop nodes after test + small test refactoring archived-at: Mon, 29 May 2017 07:56:30 -0000 ignite-gg-12138 stop nodes after test + small test refactoring Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/54beab99 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/54beab99 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/54beab99 Branch: refs/heads/ignite-5075-pds Commit: 54beab99c12762a53f539f68bf1003ebf9ea3e85 Parents: dc3450e Author: Dmitriy Govorukhin Authored: Thu May 25 20:19:22 2017 +0300 Committer: Dmitriy Govorukhin Committed: Thu May 25 20:19:22 2017 +0300 ---------------------------------------------------------------------- .../internal/binary/BinaryObjectExceptionSelfTest.java | 10 ++++++++-- .../ipfinder/TcpDiscoveryIpFinderAbstractSelfTest.java | 7 +++++++ .../tcp/ipfinder/vm/TcpDiscoveryVmIpFinderSelfTest.java | 7 +++++-- 3 files changed, 20 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/54beab99/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java index e4be824..35756a4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java @@ -45,6 +45,9 @@ public class BinaryObjectExceptionSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + /** Cache name. */ + private final String cacheName = "cache"; + /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); @@ -52,7 +55,10 @@ public class BinaryObjectExceptionSelfTest extends GridCommonAbstractTest { cfg.setMarshaller(new BinaryMarshaller()); cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(IP_FINDER)); - cfg.setCacheConfiguration(new CacheConfiguration().setCopyOnRead(true)); + cfg.setCacheConfiguration( + new CacheConfiguration(cacheName) + .setCopyOnRead(true) + ); BinaryConfiguration bcfg = new BinaryConfiguration(); @@ -84,7 +90,7 @@ public class BinaryObjectExceptionSelfTest extends GridCommonAbstractTest { public void testUnexpectedFieldType() throws Exception { IgniteEx grid = grid(0); - IgniteCache cache = grid.cache(null); + IgniteCache cache = grid.cache(cacheName); cache.put(TEST_KEY, new Value()); http://git-wip-us.apache.org/repos/asf/ignite/blob/54beab99/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAbstractSelfTest.java index 6f2201f..465b38d 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAbstractSelfTest.java @@ -54,6 +54,13 @@ public abstract class TcpDiscoveryIpFinderAbstractSelfTest= IP_FINDER.getRegisteredAddresses().size()); }