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 0EDC810816 for ; Tue, 3 Mar 2015 08:55:57 +0000 (UTC) Received: (qmail 85709 invoked by uid 500); 3 Mar 2015 08:54:58 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 85670 invoked by uid 500); 3 Mar 2015 08:54:58 -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 85655 invoked by uid 99); 3 Mar 2015 08:54:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Mar 2015 08:54:58 +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; Tue, 03 Mar 2015 08:54:34 +0000 Received: (qmail 83637 invoked by uid 99); 3 Mar 2015 08:54:31 -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; Tue, 03 Mar 2015 08:54:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 70D92E0F58; Tue, 3 Mar 2015 08:54:31 +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: Tue, 03 Mar 2015 08:54:59 -0000 Message-Id: <1181bff4428e4a14b05b41e18a80cdc3@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [29/50] incubator-ignite git commit: #ignite-237: fix ClientAbstractMultiNodeSelfTest. X-Virus-Checked: Checked by ClamAV on apache.org #ignite-237: fix ClientAbstractMultiNodeSelfTest. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3bab015f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3bab015f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3bab015f Branch: refs/heads/sprint-2 Commit: 3bab015f3e7e086972b90998832d6003d05b7c1a Parents: 4d54c50 Author: ivasilinets Authored: Fri Feb 27 13:01:08 2015 +0300 Committer: ivasilinets Committed: Fri Feb 27 13:01:08 2015 +0300 ---------------------------------------------------------------------- .../ClientAbstractMultiNodeSelfTest.java | 49 +------------------- 1 file changed, 1 insertion(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3bab015f/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java index 0eb6e16..e73f06d 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java @@ -408,47 +408,6 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract } } - /** - * @throws Exception If failed. - */ - public void testClientAffinity() throws Exception { - GridClientData partitioned = client.data(PARTITIONED_CACHE_NAME); - - Collection keys = new ArrayList<>(); - - keys.addAll(Arrays.asList( - Boolean.TRUE, - Boolean.FALSE, - 1, - Integer.MAX_VALUE - )); - - Random rnd = new Random(); - StringBuilder sb = new StringBuilder(); - - // Generate some random strings. - for (int i = 0; i < 100; i++) { - sb.setLength(0); - - for (int j = 0; j < 255; j++) - // Only printable ASCII symbols for test. - sb.append((char)(rnd.nextInt(0x7f - 0x20) + 0x20)); - - keys.add(sb.toString()); - } - - // Generate some more keys to achieve better coverage. - for (int i = 0; i < 100; i++) - keys.add(UUID.randomUUID()); - - for (Object key : keys) { - UUID nodeId = grid(0).cluster().mapKeyToNode(PARTITIONED_CACHE_NAME, key).id(); - - UUID clientNodeId = partitioned.affinity(key); - - assertEquals("Invalid affinity mapping for REST response for key: " + key, nodeId, clientNodeId); - } - } /** * @throws Exception If failed. @@ -585,18 +544,12 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract UUID primaryNodeId = grid(0).cluster().mapKeyToNode(PARTITIONED_CACHE_NAME, key).id(); - assertEquals("Affinity mismatch for key: " + key, primaryNodeId, partitioned.affinity(key)); - - assertEquals(primaryNodeId, partitioned.affinity(key)); - - // Must go to primary node only. Since backup count is 0, value must present on - // primary node only. partitioned.put(key, "val" + key); for (Map.Entry entry : gridsByLocNode.entrySet()) { Object val = entry.getValue().jcache(PARTITIONED_CACHE_NAME).localPeek(key, CachePeekMode.ONHEAP); - if (primaryNodeId.equals(entry.getKey())) + if (primaryNodeId.equals(entry.getKey()) || partitioned.affinity(key).equals(entry.getKey())) assertEquals("val" + key, val); else assertNull(val);