You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2013/12/03 14:56:31 UTC
git commit: Fixing tests broken by error handling changes.
Updated Branches:
refs/heads/master 07d9cc4c1 -> 970f36e2a
Fixing tests broken by error handling changes.
Change that was made to apigee/usergrid but did not make it into usergrid/usergrid in time for the Apache import.
See also: https://github.com/apigee/usergrid-stack/pull/257
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/970f36e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/970f36e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/970f36e2
Branch: refs/heads/master
Commit: 970f36e2a1f5991c361a8f26bf5a683f8284dae5
Parents: 07d9cc4
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Dec 3 08:56:27 2013 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Dec 3 08:56:27 2013 -0500
----------------------------------------------------------------------
.../usergrid/rest/applications/users/ActivityResourceIT.java | 3 ++-
.../org/usergrid/rest/applications/users/GroupResourceIT.java | 5 +++--
.../org/usergrid/rest/applications/users/UserResourceIT.java | 3 ++-
3 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/970f36e2/stack/rest/src/test/java/org/usergrid/rest/applications/users/ActivityResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/ActivityResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/ActivityResourceIT.java
index 3daa5c4..7dd830a 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/ActivityResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/ActivityResourceIT.java
@@ -66,7 +66,8 @@ public class ActivityResourceIT extends AbstractRestIT {
boolean fail = false;
try {
- client.postGroupActivity( GROUP, null );
+ ApiResponse groupActivity = client.postGroupActivity( GROUP, null );
+ fail = (groupActivity.getError() != null);
}
catch ( Exception e ) {
fail = true;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/970f36e2/stack/rest/src/test/java/org/usergrid/rest/applications/users/GroupResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/GroupResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/GroupResourceIT.java
index 2bfb0f1..291d73e 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/GroupResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/GroupResourceIT.java
@@ -80,8 +80,9 @@ public class GroupResourceIT extends AbstractRestIT {
{
boolean failed = false;
try {
- client.createGroup( "groupName withspace" );
- }
+ ApiResponse groupResponse = client.createGroup( "groupName withspace" );
+ failed = groupResponse.getError() != null;
+ }
catch ( Exception e ) {
failed = true;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/970f36e2/stack/rest/src/test/java/org/usergrid/rest/applications/users/UserResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/UserResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/UserResourceIT.java
index 23c2cdc..8c212a5 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/UserResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/UserResourceIT.java
@@ -878,7 +878,8 @@ public class UserResourceIT extends AbstractRestIT {
boolean fail = false;
try {
- client.changePassword( "edanuff", "foo", "bar" );
+ ApiResponse changeResponse = client.changePassword( "edanuff", "foo", "bar" );
+ fail = changeResponse.getError() != null;
}
catch ( Exception e ) {
fail = true;