You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ro...@apache.org on 2014/12/22 17:54:20 UTC
[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 <sf...@apache.org>
Authored: Tue Dec 16 08:59:55 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
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;