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 675CC1093D for ; Tue, 3 Mar 2015 20:00:42 +0000 (UTC) Received: (qmail 46082 invoked by uid 500); 3 Mar 2015 20:00:42 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 46033 invoked by uid 500); 3 Mar 2015 20:00:42 -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 45294 invoked by uid 99); 3 Mar 2015 20:00:41 -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 20:00:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 438B5E1088; Tue, 3 Mar 2015 20:00:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: grey@apache.org To: commits@usergrid.apache.org Date: Tue, 03 Mar 2015 20:01:14 -0000 Message-Id: In-Reply-To: <31613d817b9b4e14abf7adb913ddece6@git.apache.org> References: <31613d817b9b4e14abf7adb913ddece6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [35/37] 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. 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-422 Commit: 83b2c236b614e83c8902e8de47177934781d55d5 Parents: 489bf45 Author: Dave Johnson Authored: Mon Mar 2 10:07:04 2015 -0500 Committer: Dave Johnson 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"); } }