usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [1/4] incubator-usergrid git commit: This fixes many tests in ApplicationResourceIT. This is a technically a merge but Usergrid 333 was already merged into two-dot-o.
Date Tue, 03 Mar 2015 20:33:52 GMT
Repository: incubator-usergrid
Updated Branches:
  refs/heads/USERGRID-280 fa47d2da2 -> ebf6e1322


This fixes many tests in ApplicationResourceIT.  This is a technically a merge but Usergrid
333 was already merged into two-dot-o.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/83b2c236
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/83b2c236
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/83b2c236

Branch: refs/heads/USERGRID-280
Commit: 83b2c236b614e83c8902e8de47177934781d55d5
Parents: 489bf45
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Mon Mar 2 10:07:04 2015 -0500
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Mon Mar 2 10:07:04 2015 -0500

----------------------------------------------------------------------
 .../usergrid/rest/test/resource2point0/model/Credentials.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/83b2c236/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Credentials.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Credentials.java
b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Credentials.java
index 5494be5..57f85b1 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Credentials.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Credentials.java
@@ -38,10 +38,10 @@ public class Credentials extends Entity {
     }
 
     public String getClientSecret() {
-        return (String) get("secret");
+        return (String) get("client_secret");
     }
 
     public String getClientId() {
-        return (String) get("id");
+        return (String) get("client_id");
     }
 }


Mime
View raw message