You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/02/12 22:03:01 UTC
incubator-usergrid git commit: remove connections
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-365 d43903608 -> 07f6cfeda
remove connections
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/07f6cfed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/07f6cfed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/07f6cfed
Branch: refs/heads/USERGRID-365
Commit: 07f6cfedac9d5394c69c6c62355f6830bb37d2f2
Parents: d439036
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Feb 12 14:02:31 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Feb 12 14:02:31 2015 -0700
----------------------------------------------------------------------
.../usergrid/services/ServiceInvocationIT.java | 36 ++++++++++----------
1 file changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/07f6cfed/stack/services/src/test/java/org/apache/usergrid/services/ServiceInvocationIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/ServiceInvocationIT.java b/stack/services/src/test/java/org/apache/usergrid/services/ServiceInvocationIT.java
index bde23a5..850d2ae 100644
--- a/stack/services/src/test/java/org/apache/usergrid/services/ServiceInvocationIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/services/ServiceInvocationIT.java
@@ -94,7 +94,7 @@ public class ServiceInvocationIT extends AbstractServiceIT {
app.testRequest( ServiceAction.GET, 1, "users", "edanuff", "likes",
Query.fromQL( "select * where name='axis*'" ) );
- app.testRequest( ServiceAction.GET, 3, null, "users", "edanuff", "connections" );
+// app.testRequest( ServiceAction.GET, 3, null, "users", "edanuff", "connections" );
app.put( "color", "blacknwhite" );
@@ -112,7 +112,7 @@ public class ServiceInvocationIT extends AbstractServiceIT {
app.testRequest( ServiceAction.DELETE, 1, null, "users", user.getUuid(), "connections", "likes",
restaurant.getUuid() );
- app.testRequest( ServiceAction.GET, 2, null, "users", "edanuff", "connections" );
+// app.testRequest( ServiceAction.GET, 2, null, "users", "edanuff", "connections" );
app.testRequest( ServiceAction.GET, 1, null, "users", "edanuff", "likes", "restaurants" );
@@ -142,74 +142,74 @@ public class ServiceInvocationIT extends AbstractServiceIT {
Entity user = app.testBatchRequest( ServiceAction.POST, 3, batch, "users" ).getEntity();
assertNotNull( user );
}
-
+
/* Written to test fix for https://issues.apache.org/jira/browse/USERGRID-94
* (Null pointer was returned when querying names with spaces.)
* e.x.: http://localhost:8080/test-organization/test-app/contributors/Malaka Mahanama
*/
@Test
public void testRetrieveNameWithSpace() throws Exception {
-
+
Entity contributor = app.doCreate( "contributor", "Malaka Mahanama" );
app.testRequest( ServiceAction.GET, 1, "contributors" );
app.testRequest( ServiceAction.GET, 1, "contributor", contributor.getName());
}
-
+
//Making sure that names without spaces are still intact (See above test case comments).
@Test
public void testRetrieveNameWithoutSpace() throws Exception {
-
+
Entity contributor = app.doCreate( "contributor", "Malaka" );
app.testRequest( ServiceAction.GET, 1, "contributors" );
app.testRequest( ServiceAction.GET, 1, "contributor", contributor.getName());
}
-
+
/* Written to test fix for https://issues.apache.org/jira/browse/USERGRID-94
* (Null pointer was returned when querying names with spaces.)
* e.x.: http://localhost:8080/test-organization/test-app/projects/Usergrid/contains/contributors/Malaka Mahanama
*/
@Test
public void testNestedRetrieveNameWithSpace() throws Exception {
-
+
Entity contributor = app.doCreate( "contributor", "Malaka Mahanama" );
app.testRequest( ServiceAction.GET, 1, "contributors" );
app.testRequest( ServiceAction.GET, 1, "contributor", contributor.getName());
-
+
Entity project = app.doCreate( "project", "Usergrid" );
app.testRequest( ServiceAction.GET, 1, "projects" );
-
- app.testRequest( ServiceAction.POST, 1,
+
+ app.testRequest( ServiceAction.POST, 1,
"projects", project.getName(), "contains", "contributors", contributor.getName());
- app.testRequest( ServiceAction.GET, 1,
+ app.testRequest( ServiceAction.GET, 1,
"projects", project.getName(), "contains", "contributors", contributor.getName());
}
-
+
//Making sure that names without spaces are still intact (See above test case comments).
@Test
public void testNestedRetrieveNameWithoutSpace() throws Exception {
-
+
Entity contributor = app.doCreate( "contributor", "Malaka" );
app.testRequest( ServiceAction.GET, 1, "contributors" );
app.testRequest( ServiceAction.GET, 1, "contributor", contributor.getName());
-
+
Entity project = app.doCreate( "project", "Usergrid" );
app.testRequest( ServiceAction.GET, 1, "projects" );
-
- app.testRequest( ServiceAction.POST, 1,
+
+ app.testRequest( ServiceAction.POST, 1,
"projects", project.getName(), "contains", "contributors", contributor.getName());
- app.testRequest( ServiceAction.GET, 1,
+ app.testRequest( ServiceAction.GET, 1,
"projects", project.getName(), "contains", "contributors", contributor.getName());
}
}