Author: doll
Date: Tue May 20 11:08:08 2008
New Revision: 658367
URL: http://svn.apache.org/viewvc?rev=658367&view=rev
Log:
Flushed out some more of the restful tests. Added todos for the json tests left
to cover. Deleted some unused java code.
Next I will start getting some of the json tests to pass (ignoring atom for now)
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/ActivitiesServiceAdapter.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/DataServiceAdapter.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/AbstractLargeRestfulTests.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/RestfulJsonActivityTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/RestfulJsonDataTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/RestfulJsonPeopleTest.java
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/ActivitiesServiceAdapter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/ActivitiesServiceAdapter.java?rev=658367&r1=658366&r2=658367&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/ActivitiesServiceAdapter.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/ActivitiesServiceAdapter.java
Tue May 20 11:08:08 2008
@@ -25,7 +25,6 @@
import org.apache.abdera.protocol.server.ResponseContext;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
/**
@@ -70,19 +69,9 @@
}
/**
- * Handles the following URL
- * /activities/{uid}/@self/{activityId}
+ * This method is not used. It is currently handled by the ActivityAdapter.
*/
public ResponseContext getEntry(RequestContext request) {
- String uid = request.getTarget().getParameter("uid");
- String aid = request.getTarget().getParameter("aid");
-
- Activity obj = activitiesService.getActivity(uid, aid,
- getSecurityToken(request, uid)).getResponse();
-
- // TODO: how is entry id determined. check.
- String entryId = request.getUri().toString();
- Date updated = (obj != null) ? obj.getUpdated() : null;
- return returnEntry(request, obj, entryId, updated);
+ throw new UnsupportedOperationException();
}
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/DataServiceAdapter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/DataServiceAdapter.java?rev=658367&r1=658366&r2=658367&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/DataServiceAdapter.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/DataServiceAdapter.java
Tue May 20 11:08:08 2008
@@ -70,6 +70,7 @@
/**
* Handles the following URL
* /appdata/{uid}/@self/{aid}
+ * TODO: This is wrong. Getting data for @self is a collection too.
*/
public ResponseContext getEntry(RequestContext request) {
String uid = request.getTarget().getParameter("uid");
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/AbstractLargeRestfulTests.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/AbstractLargeRestfulTests.java?rev=658367&r1=658366&r2=658367&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/AbstractLargeRestfulTests.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/AbstractLargeRestfulTests.java
Tue May 20 11:08:08 2008
@@ -44,7 +44,7 @@
public abstract class AbstractLargeRestfulTests {
private static Logger logger =
- Logger.getLogger(RestfulJsonPeopleTest.class.getName());
+ Logger.getLogger(AbstractLargeRestfulTests.class.getName());
private static JettyServer server;
private static Abdera abdera = Abdera.getInstance();
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/RestfulJsonActivityTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/RestfulJsonActivityTest.java?rev=658367&r1=658366&r2=658367&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/RestfulJsonActivityTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/RestfulJsonActivityTest.java
Tue May 20 11:08:08 2008
@@ -17,21 +17,40 @@
*/
package org.apache.shindig.social.abdera;
-import org.json.JSONObject;
+import org.apache.shindig.social.ResponseItem;
+import org.apache.shindig.social.SocialApiTestsGuiceModule;
+import org.apache.shindig.social.opensocial.model.Activity;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.List;
+
public class RestfulJsonActivityTest extends AbstractLargeRestfulTests {
+ private Activity activity;
@Before
public void setUp() throws Exception {
super.setUp();
+
+ activity = SocialApiTestsGuiceModule.MockActivitiesService.basicActivity;
+ List<Activity> activities = new ArrayList<Activity>();
+ activities.add(activity);
+
+ SocialApiTestsGuiceModule.MockActivitiesService.setActivities(
+ new ResponseItem<List<Activity>>(activities));
+ SocialApiTestsGuiceModule.MockActivitiesService.setActivity(
+ new ResponseItem<Activity>(activity));
}
@After
public void tearDown() throws Exception {
+ SocialApiTestsGuiceModule.MockActivitiesService.setActivities(null);
+ SocialApiTestsGuiceModule.MockActivitiesService.setActivity(null);
+
super.tearDown();
}
@@ -51,6 +70,7 @@
resp = client.get(BASEURL + "/activities/john.doe/@self/1");
// checkForGoodJsonResponse(resp);
// JSONObject result = getJson(resp);
+ // assertActivitiesEqual(activity, result);
}
/**
@@ -75,5 +95,11 @@
resp = client.get(BASEURL + "/activities/john.doe/@self");
// checkForGoodJsonResponse(resp);
// JSONObject result = getJson(resp);
+ // assertActivitiesEqual(activity,
+ // result.getJSONArray("entry").getJSONObject(0));
}
+
+ // TODO: Add tests for the fields= parameter
+ // TODO: Add tests for post
+ // TODO: Add tests for @friends
}
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/RestfulJsonDataTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/RestfulJsonDataTest.java?rev=658367&r1=658366&r2=658367&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/RestfulJsonDataTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/RestfulJsonDataTest.java
Tue May 20 11:08:08 2008
@@ -17,7 +17,6 @@
*/
package org.apache.shindig.social.abdera;
-import org.json.JSONObject;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -48,11 +47,34 @@
* @throws Exception if test encounters an error
*/
@Test
- public void testGetAppDataJson() throws Exception {
+ public void testGetFriendsAppDataJson() throws Exception {
// app id is mocked out
resp = client.get(BASEURL + "/appdata/john.doe/@friends/appId");
// checkForGoodJsonResponse(resp);
// JSONObject result = getJson(resp);
}
+ /**
+ * Expected response for app data in json:
+ *
+ * {
+ * "entry" : {
+ * "john.doe" : {"count" : 0},
+ * }
+ * }
+ *
+ * @throws Exception if test encounters an error
+ */
+ @Test
+ public void testGetSelfAppDataJson() throws Exception {
+ // app id is mocked out
+ resp = client.get(BASEURL + "/appdata/john.doe/@self/appId");
+ // checkForGoodJsonResponse(resp);
+ // JSONObject result = getJson(resp);
+ }
+
+ // TODO: support for indexBy??
+ // TODO: support for fields parameter
+ // TODO: support for post and delete
+
}
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/RestfulJsonPeopleTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/RestfulJsonPeopleTest.java?rev=658367&r1=658366&r2=658367&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/RestfulJsonPeopleTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/RestfulJsonPeopleTest.java
Tue May 20 11:08:08 2008
@@ -86,6 +86,7 @@
*/
@Test
public void testGetPersonJson() throws Exception {
+ // Currently, for Shindig {pid}/@all/{uid} == {uid}/@self
resp = client.get(BASEURL + "/people/john.doe/@self");
checkForGoodJsonResponse(resp);
JSONObject result = getJson(resp);
@@ -142,6 +143,7 @@
*/
@Test
public void testGetPeopleJson() throws Exception {
+ // Currently, for Shindig @all == @friends
resp = client.get(BASEURL + "/people/john.doe/@friends");
checkForGoodJsonResponse(resp);
// TODO: This json doesn't parse right now
@@ -160,4 +162,8 @@
// assertEquals("simple.doe", simpleDoe.getString("id"));
}
+ // TODO: Add tests for paging, sorting
+ // TODO: Add tests for fields parameter
+ // TODO: Add tests for networkDistance
+
}
