Author: ieb
Date: Sun Nov  2 15:05:45 2008
New Revision: 709987

URL: http://svn.apache.org/viewvc?rev=709987&view=rev
Log:
SHINDIG-562

     Switched configuration from the exisiting XML Bean converters to the 
XStream versions.
     Some small modifications to the Restfull tests to unbind the base class 
from json and make it work for both xml and json.

Modified:
    
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java
    
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
    
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanAtomConverter.java
    
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
    
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
    
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java
    
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonDataTest.java
    
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
    
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
    
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java

Modified: 
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java?rev=709987&r1=709986&r2=709987&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java
 (original)
+++ 
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java
 Sun Nov  2 15:05:45 2008
@@ -22,6 +22,8 @@
 import org.apache.shindig.common.servlet.ParameterFetcher;
 import org.apache.shindig.social.core.oauth.AuthenticationHandlerProvider;
 import org.apache.shindig.social.core.util.BeanJsonConverter;
+import org.apache.shindig.social.core.util.BeanXStreamAtomConverter;
+import org.apache.shindig.social.core.util.BeanXStreamConverter;
 import org.apache.shindig.social.core.util.BeanXmlConverter;
 import org.apache.shindig.social.core.util.BeanAtomConverter;
 import org.apache.shindig.social.opensocial.service.BeanConverter;
@@ -46,11 +48,11 @@
         .to(DataServiceServletFetcher.class);
 
     
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.xml"))
-        .to(BeanXmlConverter.class);
+        .to(BeanXStreamConverter.class);
     
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.json"))
         .to(BeanJsonConverter.class);
     
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.atom"))
-        .to(BeanAtomConverter.class);
+        .to(BeanXStreamAtomConverter.class);
 
     bind(Boolean.class)
         
.annotatedWith(Names.named(AnonymousAuthenticationHandler.ALLOW_UNAUTHENTICATED))

Modified: 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java?rev=709987&r1=709986&r2=709987&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
 Sun Nov  2 15:05:45 2008
@@ -24,6 +24,8 @@
 import org.apache.shindig.social.core.oauth.AuthenticationHandlerProvider;
 import org.apache.shindig.social.core.util.BeanAtomConverter;
 import org.apache.shindig.social.core.util.BeanJsonConverter;
+import org.apache.shindig.social.core.util.BeanXStreamAtomConverter;
+import org.apache.shindig.social.core.util.BeanXStreamConverter;
 import org.apache.shindig.social.core.util.BeanXmlConverter;
 import org.apache.shindig.social.opensocial.service.BeanConverter;
 import org.apache.shindig.social.opensocial.service.DataServiceServletFetcher;
@@ -63,11 +65,11 @@
         .toInstance(Boolean.TRUE);
 
     
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.xml")).to(
-        BeanXmlConverter.class);
+        BeanXStreamConverter.class);
     
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.json")).to(
         BeanJsonConverter.class);
     
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.atom")).to(
-        BeanAtomConverter.class);
+        BeanXStreamAtomConverter.class);
 
     bind(new TypeLiteral<List<AuthenticationHandler>>(){}).toProvider(
         AuthenticationHandlerProvider.class);

Modified: 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanAtomConverter.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanAtomConverter.java?rev=709987&r1=709986&r2=709987&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanAtomConverter.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanAtomConverter.java
 Sun Nov  2 15:05:45 2008
@@ -34,7 +34,7 @@
 // TODO: This does not produce valid atom sytnax yet
 public class BeanAtomConverter implements BeanConverter {
   private static Logger logger =
-      Logger.getLogger(BeanXmlConverter.class.getName());
+      Logger.getLogger(BeanAtomConverter.class.getName());
 
 
   public String getContentType() {

Modified: 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java?rev=709987&r1=709986&r2=709987&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
 Sun Nov  2 15:05:45 2008
@@ -20,6 +20,7 @@
 
 import org.apache.shindig.common.servlet.ParameterFetcher;
 import org.apache.shindig.social.core.util.BeanJsonConverter;
+import org.apache.shindig.social.core.util.BeanXStreamConverter;
 import org.apache.shindig.social.core.util.BeanXmlConverter;
 import org.apache.shindig.social.opensocial.service.BeanConverter;
 import org.apache.shindig.social.opensocial.service.DataServiceServletFetcher;
@@ -41,7 +42,7 @@
         .toInstance("sampledata/canonicaldb.json");
     
     
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.xml")).to(
-        BeanXmlConverter.class);
+        BeanXStreamConverter.class);
     
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.json")).to(
         BeanJsonConverter.class);
 

Modified: 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java?rev=709987&r1=709986&r2=709987&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
 Sun Nov  2 15:05:45 2008
@@ -19,9 +19,10 @@
 
 import org.apache.shindig.common.testing.FakeGadgetToken;
 import org.apache.shindig.social.SocialApiTestsGuiceModule;
-import org.apache.shindig.social.core.util.BeanAtomConverter;
 import org.apache.shindig.social.core.util.BeanJsonConverter;
-import org.apache.shindig.social.core.util.BeanXmlConverter;
+import org.apache.shindig.social.core.util.BeanXStreamAtomConverter;
+import org.apache.shindig.social.core.util.BeanXStreamConverter;
+import org.apache.shindig.social.core.util.xstream.XStream081Configuration;
 import org.apache.shindig.social.opensocial.service.DataServiceServlet;
 import org.apache.shindig.social.opensocial.service.HandlerDispatcher;
 
@@ -66,32 +67,32 @@
     servlet = new DataServiceServlet();
 
     
servlet.setHandlerDispatcher(injector.getInstance(HandlerDispatcher.class));
-    servlet.setBeanConverters(new BeanJsonConverter(injector), new 
BeanXmlConverter(),
-        new BeanAtomConverter());
+    servlet.setBeanConverters(new BeanJsonConverter(injector), new 
BeanXStreamConverter(new XStream081Configuration()),
+        new BeanXStreamAtomConverter(new XStream081Configuration()));
 
     req = EasyMock.createMock(HttpServletRequest.class);
     res = EasyMock.createMock(HttpServletResponse.class);
   }
 
-  protected String getJsonResponse(String path, String method) throws 
Exception {
-    return getJsonResponse(path, method, Maps.<String, String>newHashMap(), 
"");
+  protected String getResponse(String path, String method, String format, 
String contentType) throws Exception {
+    return getResponse(path, method, Maps.<String, String>newHashMap(), "", 
format, contentType);
   }
 
-  protected String getJsonResponse(String path, String method,
-      Map<String, String> extraParams) throws Exception {
-    return getJsonResponse(path, method, extraParams, "");
+  protected String getResponse(String path, String method,
+      Map<String, String> extraParams, String format, String contentType) 
throws Exception {
+    return getResponse(path, method, extraParams, "", format, contentType);
   }
 
-  protected String getJsonResponse(String path, String method, String 
postData) throws Exception {
-    return getJsonResponse(path, method, Maps.<String, String>newHashMap(), 
postData);
+  protected String getResponse(String path, String method, String postData, 
String format, String contentType) throws Exception {
+    return getResponse(path, method, Maps.<String, String>newHashMap(), 
postData, format, contentType);
   }
 
-  protected String getJsonResponse(String path, String method, Map<String, 
String> extraParams,
-      String postData) throws Exception {
+  protected String getResponse(String path, String method, Map<String, String> 
extraParams,
+      String postData, String format, String contentType) throws Exception {
     EasyMock.expect(req.getCharacterEncoding()).andStubReturn("UTF-8");
     EasyMock.expect(req.getPathInfo()).andStubReturn(path);
     EasyMock.expect(req.getMethod()).andStubReturn(method);
-    EasyMock.expect(req.getParameter("format")).andStubReturn(null);
+    EasyMock.expect(req.getParameter("format")).andStubReturn(format);
     
EasyMock.expect(req.getParameter("X-HTTP-Method-Override")).andStubReturn(method);
 
     
EasyMock.expect(req.getAttribute(EasyMock.isA(String.class))).andReturn(FAKE_GADGET_TOKEN);
@@ -125,7 +126,7 @@
     PrintWriter writer = new PrintWriter(outputStream);
     EasyMock.expect(res.getWriter()).andReturn(writer);
     res.setCharacterEncoding("UTF-8");
-    res.setContentType("application/json");
+    res.setContentType(contentType);
 
     EasyMock.replay(req, res);
     servlet.service(req, res);

Modified: 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java?rev=709987&r1=709986&r2=709987&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java
 Sun Nov  2 15:05:45 2008
@@ -50,7 +50,7 @@
    */
   @Test
   public void testGetActivityJson() throws Exception {
-    String resp = getJsonResponse("/activities/john.doe/@self/@app/1", "GET");
+    String resp = getResponse("/activities/john.doe/@self/@app/1", "GET", 
null, "application/json");
     JSONObject result = getJson(resp);
     assertActivitiesEqual(johnsActivity, result.getJSONObject("entry"));
   }
@@ -71,7 +71,7 @@
    */
   @Test
   public void testGetActivitiesJson() throws Exception {
-    String resp = getJsonResponse("/activities/john.doe/@self", "GET");
+    String resp = getResponse("/activities/john.doe/@self", "GET", null, 
"application/json");
     JSONObject result = getJson(resp);
 
     assertEquals(1, result.getInt("totalResults"));
@@ -95,7 +95,7 @@
    */
   @Test
   public void testGetFriendsActivitiesJson() throws Exception {
-    String resp = getJsonResponse("/activities/john.doe/@friends", "GET");
+    String resp = getResponse("/activities/john.doe/@friends", "GET", null, 
"application/json");
     JSONObject result = getJson(resp);
 
     assertEquals(2, result.getInt("totalResults"));
@@ -113,9 +113,9 @@
   @Test
   public void testCreateActivity() throws Exception {
     String postData = "{title : 'hi mom!', body : 'and dad.'}";
-    String createResponse = getJsonResponse("/activities/john.doe/@self", 
"POST", postData);
+    String createResponse = getResponse("/activities/john.doe/@self", "POST", 
postData, null, "application/json");
 
-    String resp = getJsonResponse("/activities/john.doe/@self", "GET");
+    String resp = getResponse("/activities/john.doe/@self", "GET", null, 
"application/json");
     JSONObject result = getJson(resp);
 
     assertEquals(2, result.getInt("totalResults"));

Modified: 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonDataTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonDataTest.java?rev=709987&r1=709986&r2=709987&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonDataTest.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonDataTest.java
 Sun Nov  2 15:05:45 2008
@@ -44,7 +44,7 @@
     // app id is mocked out
     Map<String, String> extraParams = Maps.newHashMap();
     extraParams.put("fields", "count");
-    String resp = getJsonResponse("/appdata/john.doe/@friends/app", "GET", 
extraParams);
+    String resp = getResponse("/appdata/john.doe/@friends/app", "GET", 
extraParams, null, "application/json");
 
     JSONObject data = getJson(resp).getJSONObject("entry");
     assertEquals(3, data.length());
@@ -74,7 +74,7 @@
     // app id is mocked out
     Map<String, String> extraParams = Maps.newHashMap();
     extraParams.put("fields", null);
-    String resp = getJsonResponse("/appdata/john.doe/@self/app", "GET", 
extraParams);
+    String resp = getResponse("/appdata/john.doe/@self/app", "GET", 
extraParams, null, "application/json");
 
     JSONObject data = getJson(resp).getJSONObject("entry");
     assertEquals(1, data.length());
@@ -100,7 +100,7 @@
     // app id is mocked out
     Map<String, String> extraParams = Maps.newHashMap();
     extraParams.put("fields", "count");
-    String resp = getJsonResponse("/appdata/john.doe/@self/app", "GET", 
extraParams);
+    String resp = getResponse("/appdata/john.doe/@self/app", "GET", 
extraParams, null, "application/json");
 
     JSONObject data = getJson(resp).getJSONObject("entry");
     assertEquals(1, data.length());
@@ -127,7 +127,7 @@
     // app id is mocked out
     Map<String, String> extraParams = Maps.newHashMap();
     extraParams.put("fields", "peabody");
-    String resp = getJsonResponse("/appdata/john.doe/@self/app", "GET", 
extraParams);
+    String resp = getResponse("/appdata/john.doe/@self/app", "GET", 
extraParams, null, "application/json");
 
     JSONObject data = getJson(resp).getJSONObject("entry");
     assertEquals(1, data.length());
@@ -143,12 +143,12 @@
     // With the wrong field
     Map<String, String> extraParams = Maps.newHashMap();
     extraParams.put("fields", "peabody");
-    getJsonResponse("/appdata/john.doe/@self/app", "DELETE", extraParams);
+    getResponse("/appdata/john.doe/@self/app", "DELETE", extraParams, null, 
"application/json");
 
     assertCount("0");
 
     extraParams.put("fields", "count");
-    getJsonResponse("/appdata/john.doe/@self/app", "DELETE", extraParams);
+    getResponse("/appdata/john.doe/@self/app", "DELETE", extraParams, null, 
"application/json");
 
     assertCount(null);
   }
@@ -160,13 +160,13 @@
     Map<String, String> extraParams = Maps.newHashMap();
     extraParams.put("fields", "count");
     String postData = "{count : 5}";
-    getJsonResponse("/appdata/john.doe/@self/app", "POST", extraParams, 
postData);
+    getResponse("/appdata/john.doe/@self/app", "POST", extraParams, postData, 
null, "application/json");
 
     assertCount("5");
   }
 
   private void assertCount(String expectedCount) throws Exception {
-    String resp = getJsonResponse("/appdata/john.doe/@self/app", "GET");
+    String resp = getResponse("/appdata/john.doe/@self/app", "GET", null, 
"application/json");
     JSONObject data = getJson(resp).getJSONObject("entry");
     assertEquals(1, data.length());
 

Modified: 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java?rev=709987&r1=709986&r2=709987&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
 Sun Nov  2 15:05:45 2008
@@ -212,7 +212,7 @@
     extraParams.put("fields", allFieldsParam);
 
     // Currently, for Shindig {pid}/@all/{uid} == {uid}/@self
-    String resp = getJsonResponse("/people/canonical/@self", "GET", 
extraParams);
+    String resp = getResponse("/people/canonical/@self", "GET", extraParams, 
null, "application/json");
     JSONObject result = getJson(resp).getJSONObject("entry");
 
     assertStringField(result, canonical.getAboutMe(), Person.Field.ABOUT_ME);
@@ -451,7 +451,7 @@
     extraParams.put("fields", null);
 
     // Currently, for Shindig @all == @friends
-    String resp = getJsonResponse("/people/john.doe/@friends", "GET", 
extraParams);
+    String resp = getResponse("/people/john.doe/@friends", "GET", extraParams, 
null, "application/json");
     JSONObject result = getJson(resp);
 
     assertEquals(3, result.getInt("totalResults"));
@@ -474,7 +474,7 @@
     extraParams.put("count", "1");
     extraParams.put("fields", null);
 
-    String resp = getJsonResponse("/people/john.doe/@friends", "GET", 
extraParams);
+    String resp = getResponse("/people/john.doe/@friends", "GET", extraParams, 
null, "application/json");
     JSONObject result = getJson(resp);
 
     assertEquals(3, result.getInt("totalResults"));
@@ -485,7 +485,7 @@
 
     // Get the second page
     extraParams.put("startIndex", "1");
-    resp = getJsonResponse("/people/john.doe/@friends", "GET", extraParams);
+    resp = getResponse("/people/john.doe/@friends", "GET", extraParams, null, 
"application/json");
     result = getJson(resp);
 
     assertEquals(3, result.getInt("totalResults"));

Modified: 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java?rev=709987&r1=709986&r2=709987&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
 Sun Nov  2 15:05:45 2008
@@ -24,7 +24,10 @@
 import org.apache.shindig.social.SocialApiTestsGuiceModule;
 import org.apache.shindig.social.core.util.BeanAtomConverter;
 import org.apache.shindig.social.core.util.BeanJsonConverter;
+import org.apache.shindig.social.core.util.BeanXStreamAtomConverter;
+import org.apache.shindig.social.core.util.BeanXStreamConverter;
 import org.apache.shindig.social.core.util.BeanXmlConverter;
+import org.apache.shindig.social.core.util.xstream.XStream081Configuration;
 import org.apache.shindig.social.opensocial.spi.SocialSpiException;
 
 import com.google.common.collect.Maps;
@@ -66,8 +69,8 @@
     req = EasyMock.createMock(HttpServletRequest.class);
     res = EasyMock.createMock(HttpServletResponse.class);
     jsonConverter = EasyMock.createMock(BeanJsonConverter.class);
-    BeanXmlConverter xmlConverter = 
EasyMock.createMock(BeanXmlConverter.class);
-    BeanAtomConverter atomConverter = 
EasyMock.createMock(BeanAtomConverter.class);
+    BeanXStreamConverter xmlConverter = 
EasyMock.createMock(BeanXStreamConverter.class);
+    BeanXStreamAtomConverter atomConverter = 
EasyMock.createMock(BeanXStreamAtomConverter.class);
     peopleHandler = EasyMock.createMock(PersonHandler.class);
     activityHandler = EasyMock.createMock(ActivityHandler.class);
     appDataHandler = EasyMock.createMock(AppDataHandler.class);
@@ -200,8 +203,8 @@
   public void testGetConverterForRequest() throws Exception {
     BeanJsonConverter json = new BeanJsonConverter(
         Guice.createInjector(new SocialApiTestsGuiceModule()));
-    BeanXmlConverter xml = new BeanXmlConverter();
-    BeanAtomConverter atom = new BeanAtomConverter();
+    BeanXStreamConverter xml = new BeanXStreamConverter(new 
XStream081Configuration());
+    BeanXStreamAtomConverter atom = new BeanXStreamAtomConverter(new 
XStream081Configuration());
     servlet.setBeanConverters(json, xml, atom);
 
     assertConverter(atom, "atom");
@@ -214,8 +217,8 @@
   public void testGetConverterForRequestContentType() throws Exception {
     BeanJsonConverter json = new BeanJsonConverter(Guice
         .createInjector(new SocialApiTestsGuiceModule()));
-    BeanXmlConverter xml = new BeanXmlConverter();
-    BeanAtomConverter atom = new BeanAtomConverter();
+    BeanXStreamConverter xml = new BeanXStreamConverter(new 
XStream081Configuration());
+    BeanXStreamAtomConverter atom = new BeanXStreamAtomConverter(new 
XStream081Configuration());
     servlet.setBeanConverters(json, xml, atom);
 
     assertConverterForContentType(atom, "application/atom+xml");

Modified: 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java?rev=709987&r1=709986&r2=709987&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
 Sun Nov  2 15:05:45 2008
@@ -21,6 +21,8 @@
 import org.apache.shindig.common.util.ImmediateFuture;
 import org.apache.shindig.social.core.util.BeanAtomConverter;
 import org.apache.shindig.social.core.util.BeanJsonConverter;
+import org.apache.shindig.social.core.util.BeanXStreamAtomConverter;
+import org.apache.shindig.social.core.util.BeanXStreamConverter;
 import org.apache.shindig.social.core.util.BeanXmlConverter;
 
 import com.google.common.collect.Maps;
@@ -57,15 +59,15 @@
   private AppDataHandler appDataHandler;
 
   private BeanJsonConverter jsonConverter;
-  private BeanXmlConverter xmlConverter;
+  private BeanXStreamConverter xmlConverter;
 
   @Override protected void setUp() throws Exception {
     servlet = new JsonRpcServlet();
     req = EasyMock.createMock(HttpServletRequest.class);
     res = EasyMock.createMock(HttpServletResponse.class);
     jsonConverter = EasyMock.createMock(BeanJsonConverter.class);
-    xmlConverter = EasyMock.createMock(BeanXmlConverter.class);
-    BeanAtomConverter atomConverter = 
EasyMock.createMock(BeanAtomConverter.class);
+    xmlConverter = EasyMock.createMock(BeanXStreamConverter.class);
+    BeanXStreamAtomConverter atomConverter = 
EasyMock.createMock(BeanXStreamAtomConverter.class);
 
     peopleHandler = EasyMock.createMock(PersonHandler.class);
     activityHandler = EasyMock.createMock(ActivityHandler.class);


Reply via email to