Return-Path: X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org Delivered-To: apmail-usergrid-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 1C13F10578 for ; Mon, 22 Dec 2014 16:54:09 +0000 (UTC) Received: (qmail 25933 invoked by uid 500); 22 Dec 2014 16:54:08 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 25873 invoked by uid 500); 22 Dec 2014 16:54:08 -0000 Mailing-List: contact commits-help@usergrid.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.incubator.apache.org Delivered-To: mailing list commits@usergrid.incubator.apache.org Received: (qmail 25164 invoked by uid 99); 22 Dec 2014 16:54:08 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Dec 2014 16:54:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 19F9BA32E0F; Mon, 22 Dec 2014 16:54:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rockerston@apache.org To: commits@usergrid.apache.org Date: Mon, 22 Dec 2014 16:54:20 -0000 Message-Id: <2684a63ccdb84df3b94d3a6669afa082@git.apache.org> In-Reply-To: <257e7d24d3774206803b4a886e01a93e@git.apache.org> References: <257e7d24d3774206803b4a886e01a93e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/50] incubator-usergrid git commit: provide easier accessors to clientsetup provide easier accessors to clientsetup Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4ddf6ad9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4ddf6ad9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4ddf6ad9 Branch: refs/heads/two-dot-o Commit: 4ddf6ad9048b7f0a56f511448f62aecb9fbadf14 Parents: 8f39264 Author: Shawn Feldman Authored: Tue Dec 16 08:59:55 2014 -0700 Committer: Shawn Feldman Committed: Tue Dec 16 08:59:55 2014 -0700 ---------------------------------------------------------------------- portal/Gruntfile.js | 1 - .../rest/test/resource2point0/AbstractRestIT.java | 9 ++++++++- .../usergrid/rest/test/resource2point0/ClientSetup.java | 10 ++-------- 3 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4ddf6ad9/portal/Gruntfile.js ---------------------------------------------------------------------- diff --git a/portal/Gruntfile.js b/portal/Gruntfile.js index c00d961..b730b93 100644 --- a/portal/Gruntfile.js +++ b/portal/Gruntfile.js @@ -75,7 +75,6 @@ module.exports = function(grunt) { 'js/libs/jquery/jquery-1.9.1.min.js', 'js/libs/jquery/jquery-migrate-1.1.1.min.js', 'js/libs/jquery/jquery.sparkline.min.js', - 'js/libs/Highcharts-2.3.5/js/highcharts.js', 'js/libs/angular-1.2.5/angular.min.js', 'js/libs/angular-1.2.5/angular-route.min.js', 'js/libs/angular-1.2.5/angular-resource.min.js', http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4ddf6ad9/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java index 4310718..102de4b 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java @@ -21,6 +21,8 @@ import java.net.URI; import java.net.URLClassLoader; import java.util.Arrays; +import org.apache.usergrid.rest.test.resource2point0.endpoints.ApplicationResource; +import org.apache.usergrid.rest.test.resource2point0.endpoints.OrganizationResource; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Rule; @@ -94,7 +96,12 @@ public class AbstractRestIT extends JerseyTest { return new com.sun.jersey.test.framework.spi.container.external.ExternalTestContainerFactory(); } + protected OrganizationResource getOrganizationResource(){ + return clientSetup.restClient.org(clientSetup.getOrganization().getName()); + } - + protected ApplicationResource getApplicationResource(){ + return clientSetup.restClient.org(clientSetup.getOrganization().getName()).app(clientSetup.getAppName()); + } } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4ddf6ad9/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java index 9db734c..3d5c637 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java @@ -104,16 +104,10 @@ public class ClientSetup implements TestRule { public Organization getOrganization(){return organization;} - public String getAppName() {return appName;} + public String getOrganizationName(){return orgName;} - public OrganizationResource getOrganizationResource(){ - return restClient.org(orgName); - } - public ApplicationResource getApplicationResource(){ - restClient.token().post(new Token(username,username)); + public String getAppName() {return appName;} - return restClient.org(orgName).app(appName); - } public RestClient getRestClient(){ return restClient;