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 2015/02/26 18:11:37 UTC

[36/50] [abbrv] incubator-usergrid git commit: updated collection IT

updated collection IT


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

Branch: refs/heads/two-dot-o-import
Commit: 8206b7266b8e329a1bcdb1f50dca5438b68024f4
Parents: 90afb20
Author: Rod Simpson <ro...@rodsimpson.com>
Authored: Wed Feb 25 13:26:31 2015 -0700
Committer: Rod Simpson <ro...@rodsimpson.com>
Committed: Wed Feb 25 13:26:31 2015 -0700

----------------------------------------------------------------------
 .../applications/collection/CollectionsResourceIT.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8206b726/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
index dda1a8e..b9e1191 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
@@ -66,7 +66,7 @@ public class CollectionsResourceIT 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( "organization_application_not_found", node.get( "error" ).textValue() );
         }
 
         //try to do a POST on a bad path
@@ -79,7 +79,7 @@ public class CollectionsResourceIT 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( "organization_application_not_found", node.get( "error" ).textValue() );
         }
 
         //try to do a PUT on a bad path
@@ -89,7 +89,7 @@ public class CollectionsResourceIT 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( "organization_application_not_found", node.get( "error" ).textValue() );
         }
 
         //try to do a delete on a bad path
@@ -99,7 +99,7 @@ public class CollectionsResourceIT 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( "organization_application_not_found", node.get( "error" ).textValue() );
         }
 
     }
@@ -179,11 +179,11 @@ public class CollectionsResourceIT extends AbstractRestIT {
     @Test
     public void stringWithSpaces() throws IOException {
 
+        // create entity with a property with spaces
         String collection = "calendarlists";
-        // create user
-        Entity payload = new Entity();
         String summaryOverview = "My Summary";
         String calType = "personal";
+        Entity payload = new Entity();
         payload.put("summaryOverview", summaryOverview);
         payload.put("caltype", calType);
         Entity calendarlistOne = this.app().collection(collection).post(payload);