You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/05/08 03:53:40 UTC
svn commit: r942294 -
/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
Author: lindner
Date: Sat May 8 01:53:39 2010
New Revision: 942294
URL: http://svn.apache.org/viewvc?rev=942294&view=rev
Log:
fix broken tests
Modified:
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java?rev=942294&r1=942293&r2=942294&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java Sat May 8 01:53:39 2010
@@ -99,8 +99,9 @@ public abstract class AbstractLargeRestf
Names.named("org.apache.shindig.social.handlers"))));
servlet.setHandlerRegistry(dispatcher);
ContainerConfig containerConfig = EasyMock.createMock(ContainerConfig.class);
- EasyMock.expect(containerConfig.<String>getList(null, "gadgets.parentOrigins")).andReturn(Collections.<String>singletonList("*"));
- servlet.setContainerConfig(EasyMock.createMock(ContainerConfig.class));
+ EasyMock.expect(containerConfig.<String>getList(null, "gadgets.parentOrigins")).andReturn(Collections.<String>singletonList("*")).anyTimes();
+ EasyMock.replay(containerConfig);
+ servlet.setContainerConfig(containerConfig);
servlet.setBeanConverters(new BeanJsonConverter(injector),
new BeanXStreamConverter(new XStream081Configuration(injector)),
new BeanXStreamAtomConverter(new XStream081Configuration(injector)));
@@ -156,6 +157,7 @@ public abstract class AbstractLargeRestf
EasyMock.expect(res.getWriter()).andReturn(writer);
res.setCharacterEncoding("UTF-8");
res.setContentType(contentType);
+ res.addHeader("Access-Control-Allow-Origin", "*");
EasyMock.replay(res);
servlet.service(req, res);