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 08:47:27 UTC

svn commit: r942321 - /shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulTestConfigHelper.java

Author: lindner
Date: Sat May  8 06:47:26 2010
New Revision: 942321

URL: http://svn.apache.org/viewvc?rev=942321&view=rev
Log:
fix samples build

Modified:
    shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulTestConfigHelper.java

Modified: shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulTestConfigHelper.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulTestConfigHelper.java?rev=942321&r1=942320&r2=942321&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulTestConfigHelper.java (original)
+++ shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulTestConfigHelper.java Sat May  8 06:47:26 2010
@@ -18,6 +18,7 @@
 
 package org.apache.shindig.social.opensocial.jpa.spi.integration;
 
+import org.apache.shindig.config.ContainerConfig;
 import org.apache.shindig.protocol.DataServiceServlet;
 import org.apache.shindig.protocol.HandlerRegistry;
 import org.apache.shindig.protocol.conversion.BeanJsonConverter;
@@ -30,12 +31,15 @@ import org.apache.shindig.social.opensoc
 import org.apache.shindig.social.opensocial.service.MessageHandler;
 import org.apache.shindig.social.opensocial.service.PersonHandler;
 
-import javax.persistence.EntityManager;
+import org.easymock.EasyMock;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 
+import java.util.Collections;
+import javax.persistence.EntityManager;
+
 /**
  * JPARestfulTestConfigHelper helps configure a JPA Restful test.
  */
@@ -71,6 +75,11 @@ public class JpaRestfulTestConfigHelper 
     servlet.setBeanConverters(new BeanJsonConverter(injector),
         new BeanXStreamConverter(new XStream081Configuration(injector)),
         new BeanXStreamAtomConverter(new XStream081Configuration(injector)));
+
+    ContainerConfig containerConfig = EasyMock.createMock(ContainerConfig.class);
+    EasyMock.expect(containerConfig.<String>getList(null, "gadgets.parentOrigins")).andReturn(Collections.<String>singletonList("*")).anyTimes();
+    EasyMock.replay(containerConfig);
+    servlet.setContainerConfig(containerConfig);
     return servlet;
   }