Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-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 71C7D18EC3 for ; Thu, 17 Mar 2016 21:14:03 +0000 (UTC) Received: (qmail 30559 invoked by uid 500); 17 Mar 2016 21:14:03 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 30526 invoked by uid 500); 17 Mar 2016 21:14:03 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 30509 invoked by uid 99); 17 Mar 2016 21:14:03 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Mar 2016 21:14:03 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id DCFA7C0741 for ; Thu, 17 Mar 2016 21:14:02 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id H_rdY0AFiW4k for ; Thu, 17 Mar 2016 21:14:01 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id 924435F1F3 for ; Thu, 17 Mar 2016 21:14:00 +0000 (UTC) Received: (qmail 30330 invoked by uid 99); 17 Mar 2016 21:13:59 -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, 17 Mar 2016 21:13:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CEF73DFA0A; Thu, 17 Mar 2016 21:13:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.incubator.apache.org Date: Thu, 17 Mar 2016 21:13:59 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [01/26] incubator-geode git commit: GEODE-1053: Refactoring some test code. Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-949-2 5dcd68178 -> 2184de4dc GEODE-1053: Refactoring some test code. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/e22cd953 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/e22cd953 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/e22cd953 Branch: refs/heads/feature/GEODE-949-2 Commit: e22cd9532946322c0a0829b755ab184cd08977fb Parents: f217552 Author: Udo Kohlmeyer Authored: Wed Mar 9 20:06:49 2016 +1100 Committer: Udo Kohlmeyer Committed: Wed Mar 16 05:53:57 2016 +1100 ---------------------------------------------------------------------- ...stAPIOnRegionFunctionExecutionDUnitTest.java | 1 - ...APIsOnMembersFunctionExecutionDUnitTest.java | 26 ++++++++------------ 2 files changed, 10 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e22cd953/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java index 63bd9fa..de7c97c 100644 --- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java +++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java @@ -36,7 +36,6 @@ import java.util.*; /** * Dunit Test to validate OnRegion function execution with REST APIs * - * @author Nilkanth Patel * @since 8.0 */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e22cd953/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java index ac922ad..7a994d6 100644 --- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java +++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java @@ -30,10 +30,6 @@ import org.apache.http.client.methods.CloseableHttpResponse; import java.util.Properties; -/** - * @author Nilkanth Patel - */ - public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase { private static final long serialVersionUID = 1L; @@ -111,10 +107,7 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase } public void testFunctionExecutionOnAllMembers() { - restURLs.add(vm0.invoke(() -> createCacheAndRegisterFunction(vm0, "m1"))); - restURLs.add(vm1.invoke(() -> createCacheAndRegisterFunction(vm1, "m2"))); - restURLs.add(vm2.invoke(() -> createCacheAndRegisterFunction(vm2, "m3"))); - restURLs.add(vm3.invoke(() -> createCacheAndRegisterFunction(vm3, "m4"))); + createCacheForVMs(); for (int i = 0; i < 10; i++) { CloseableHttpResponse response = executeFunctionThroughRestCall("OnMembersFunction",null,null,null,null,null); @@ -131,11 +124,15 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase restURLs.clear(); } + private void createCacheForVMs() { + restURLs.add(vm0.invoke(() -> createCacheAndRegisterFunction(vm0, "m1"))); + restURLs.add(vm1.invoke(() -> createCacheAndRegisterFunction(vm1, "m2"))); + restURLs.add(vm2.invoke(() -> createCacheAndRegisterFunction(vm2, "m3"))); + restURLs.add(vm3.invoke(() -> createCacheAndRegisterFunction(vm3, "m4"))); + } + public void testFunctionExecutionEOnSelectedMembers() { - restURLs.add((String) vm0.invoke(() -> createCacheAndRegisterFunction(vm0, "m1"))); - restURLs.add((String) vm1.invoke(() -> createCacheAndRegisterFunction(vm1, "m2"))); - restURLs.add((String) vm2.invoke(() -> createCacheAndRegisterFunction(vm2, "m3"))); - restURLs.add((String) vm3.invoke(() -> createCacheAndRegisterFunction(vm3, "m4"))); + createCacheForVMs(); for (int i = 0; i < 10; i++) { CloseableHttpResponse response = executeFunctionThroughRestCall("OnMembersFunction",null,null,null,null,"m1,m2,m3"); @@ -153,10 +150,7 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase } public void testFunctionExecutionOnMembersWithFilter() { - restURLs.add((String) vm0.invoke(() -> createCacheAndRegisterFunction(vm0, "m1"))); - restURLs.add((String) vm1.invoke(() -> createCacheAndRegisterFunction(vm1, "m2"))); - restURLs.add((String) vm2.invoke(() -> createCacheAndRegisterFunction(vm2, "m3"))); - restURLs.add((String) vm3.invoke(() -> createCacheAndRegisterFunction(vm3, "m4"))); + createCacheForVMs(); for (int i = 0; i < 10; i++) { CloseableHttpResponse response = executeFunctionThroughRestCall("OnMembersFunction",null,"key2",null,null,"m1,m2,m3");