You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/07/31 00:56:02 UTC
incubator-usergrid git commit: Test fixes that depended on
service_resource when they were expecting entity not found.
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-dev 812de6ae6 -> 9b9f39876
Test fixes that depended on service_resource when they were expecting entity not found.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9b9f3987
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9b9f3987
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9b9f3987
Branch: refs/heads/two-dot-o-dev
Commit: 9b9f39876b4a3a81ef22858bf4582094b19fd26f
Parents: 812de6a
Author: GERey <gr...@apigee.com>
Authored: Thu Jul 30 15:56:00 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Thu Jul 30 15:56:00 2015 -0700
----------------------------------------------------------------------
.../rest/applications/collection/groups/GroupResourceIT.java | 4 ++--
.../java/org/apache/usergrid/services/CollectionServiceIT.java | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9b9f3987/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
index a442582..a52792a 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
@@ -199,7 +199,7 @@ public class GroupResourceIT extends AbstractRestIT {
} catch (UniformInterfaceException e) {
//verify the correct error was returned
JsonNode node = mapper.readTree( e.getResponse().getEntity( String.class ));
- assertEquals( "service_resource_not_found", node.get( "error" ).textValue() );
+ assertEquals( "entity_not_found", node.get( "error" ).textValue() );
}
}
@@ -305,7 +305,7 @@ public class GroupResourceIT extends AbstractRestIT {
} catch (UniformInterfaceException e) {
//verify the correct error was returned
JsonNode node = mapper.readTree( e.getResponse().getEntity( String.class ));
- assertEquals( "service_resource_not_found", node.get( "error" ).textValue() );
+ assertEquals( "entity_not_found", node.get( "error" ).textValue() );
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9b9f3987/stack/services/src/test/java/org/apache/usergrid/services/CollectionServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/CollectionServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/services/CollectionServiceIT.java
index a243339..b9f7105 100644
--- a/stack/services/src/test/java/org/apache/usergrid/services/CollectionServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/services/CollectionServiceIT.java
@@ -22,6 +22,7 @@ import org.junit.Test;
import org.apache.usergrid.persistence.Entity;
import org.apache.usergrid.persistence.Schema;
+import org.apache.usergrid.persistence.exceptions.EntityNotFoundException;
import org.apache.usergrid.persistence.exceptions.RequiredPropertyNotFoundException;
import org.apache.usergrid.persistence.exceptions.UnexpectedEntityTypeException;
import org.apache.usergrid.persistence.schema.CollectionInfo;
@@ -64,7 +65,7 @@ public class CollectionServiceIT extends AbstractServiceIT {
catch ( UnexpectedEntityTypeException uee ) {
// ok
}
- catch ( ServiceResourceNotFoundException srnfe ) {
+ catch ( EntityNotFoundException enfe ) {
// ok
}
@@ -173,7 +174,7 @@ public class CollectionServiceIT extends AbstractServiceIT {
app.testRequest( ServiceAction.GET, 0, "cats", "Danny" );
Assert.fail();
}
- catch ( ServiceResourceNotFoundException srnfe ) {
+ catch ( EntityNotFoundException enfe ) {
// ok
}